using on all OSX variants

[wxWidgets.git] / src / gtk1 / control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index d77a65f4e8b37acaeddb54de970beb43ff3767ad..42167081751742301fb32e1527de94ee3b9f6059 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/settings.h"
 #include "wx/gtk1/private.h"
 
 // ============================================================================
@@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 }
 
 bool wxControl::Create( wxWindow *parent,
@@ -83,7 +83,7 @@ void wxControl::PostCreation(const wxSize& size)
     gtk_widget_ensure_style(m_widget);
 
     ApplyWidgetStyle();
-    SetInitialBestSize(size);
+    SetInitialSize(size);
 }
 
 // ----------------------------------------------------------------------------
@@ -120,7 +120,7 @@ void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 
     const wxString labelGTK = GTKRemoveMnemonics(label);
 
-    gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
+    gtk_frame_set_label(w, labelGTK.empty() ? (const char *)NULL
                                             : wxGTK_CONV(labelGTK));
 }
 
@@ -134,7 +134,7 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label)
     {
         wxChar ch = label[i];
 
-        if ( ch == _T('&') )
+        if ( ch == wxT('&') )
         {
             if ( i == len - 1 )
             {
@@ -144,7 +144,7 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label)
             }
 
             ch = label[++i]; // skip '&' itself
-            if ( ch == _T('&') )
+            if ( ch == wxT('&') )
             {
                 // special case: "&&" is not a mnemonic at all but just an
                 // escaped "&"