Merge branch 'TimePath/gtk++' into 'master'

[xonotic/netradiant.git] / radiant / surfacedialog.cpp

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index 64ab34aad7251cb84f939966335b742f084b40e8..f97745598e2c551174ca5ea4321368f6d9614056 100644 (file)
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -122,7 +122,7 @@ float& m_f;
 public:
 GtkSpinButton* m_spin;
 ui::Entry m_entry;
-Increment( float& f ) : m_f( f ), m_spin( 0 ), m_entry( nullptr ){
+Increment( float& f ) : m_f( f ), m_spin( 0 ), m_entry( ui::null ){
 }
 void cancel(){
        entry_set_float( m_entry, m_f );
@@ -159,7 +159,7 @@ GtkCheckButton* m_surfaceFlags[32];
 GtkCheckButton* m_contentFlags[32];
 
 NonModalEntry m_valueEntry;
-ui::Entry m_valueEntryWidget{nullptr};
+ui::Entry m_valueEntryWidget{ui::null};
 public:
 WindowPositionTracker m_positionTracker;
 WindowPositionTrackerImportStringCaller m_importPosition;