wxGTK compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f2449d0911a0a27ce0df8ad41e1b199a73df42d4..38d1da52e225c02f1cb07ac84a4a744b205f2262 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -583,9 +583,12 @@ enum
 #define wxWANTS_CHARS           0x00040000
 
 // Make window retained (mostly Motif, I think)
 #define wxWANTS_CHARS           0x00040000
 
 // Make window retained (mostly Motif, I think)

-#define wxRETAINED              0x0002000
+#define wxRETAINED              0x00020000

 #define wxBACKINGSTORE          wxRETAINED
 
 #define wxBACKINGSTORE          wxRETAINED
 

+// don't invalidate the whole window (resulting in a PAINT event) when the
+// window is resized (currently, makes sense for wxMSW only)
+#define wxNO_FULLREPAINT_ON_RESIZE 0x00010000

 /*
  * wxFrame/wxDialog style flags
  */
 /*
  * wxFrame/wxDialog style flags
  */

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 45d0ea230ec327f8ab532a6e4ad6c25f03565bff..f18f219d8c691229e212d30683432ae21183302e 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -29,7 +29,7 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

-class wxControl : public wxControlBase
+class wxControl : public wxWindow

 {
     DECLARE_DYNAMIC_CLASS(wxControl)
 
 {
     DECLARE_DYNAMIC_CLASS(wxControl)
 

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 45d0ea230ec327f8ab532a6e4ad6c25f03565bff..f18f219d8c691229e212d30683432ae21183302e 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -29,7 +29,7 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

-class wxControl : public wxControlBase
+class wxControl : public wxWindow

 {
     DECLARE_DYNAMIC_CLASS(wxControl)
 
 {
     DECLARE_DYNAMIC_CLASS(wxControl)
 

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index e767eac88f3969030906664bbee9b954cafd90f9..578b12cb9fcdd8f3e7bceea2f76549ffd14934e6 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -38,7 +38,7 @@ wxControl::wxControl( wxWindow *parent,
 
 void wxControl::SetLabel( const wxString &label )
 {
 
 void wxControl::SetLabel( const wxString &label )
 {

-    m_label = _T("");
+    m_label.Empty();

     for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
     {
         if ( *pc == _T('&') )
     for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
     {
         if ( *pc == _T('&') )

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 7e01371333a7d3f8727315aaf1aae07574853a10..a2d7b7536fcfbeacc016cdc52daf455a7ad37793 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2011,7 +2011,7 @@ void wxWindow::PreCreation( wxWindow *parent,
 {
     wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
 
 {
     wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
 

-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

     {
         wxFAIL_MSG(_T("window creation failed"));
     }
     {
         wxFAIL_MSG(_T("window creation failed"));
     }

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index e767eac88f3969030906664bbee9b954cafd90f9..578b12cb9fcdd8f3e7bceea2f76549ffd14934e6 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -38,7 +38,7 @@ wxControl::wxControl( wxWindow *parent,
 
 void wxControl::SetLabel( const wxString &label )
 {
 
 void wxControl::SetLabel( const wxString &label )
 {

-    m_label = _T("");
+    m_label.Empty();

     for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
     {
         if ( *pc == _T('&') )
     for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
     {
         if ( *pc == _T('&') )

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 7e01371333a7d3f8727315aaf1aae07574853a10..a2d7b7536fcfbeacc016cdc52daf455a7ad37793 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2011,7 +2011,7 @@ void wxWindow::PreCreation( wxWindow *parent,
 {
     wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
 
 {
     wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
 

-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

     {
         wxFAIL_MSG(_T("window creation failed"));
     }
     {
         wxFAIL_MSG(_T("window creation failed"));
     }