aui dock renumbering fix

[wxWidgets.git] / src / generic / panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9fba59a9fcc12ac97744e219a04b0905e02d8058..d714bce3c08935bc3602c6f9453b590ea8e3adb7 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "panelg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,11 +30,10 @@
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/log.h"

+    #include "wx/panel.h"
+    #include "wx/containr.h"

 #endif
 
 #endif
 

-#include "wx/containr.h"
-#include "wx/panel.h"
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -55,7 +50,7 @@ wxBEGIN_FLAGS( wxPanelStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -86,15 +81,13 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxPanel)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxPanel)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)

-    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-

     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)


@@ -104,7 +97,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)

 
 // ----------------------------------------------------------------------------
 // wxPanel creation
 
 // ----------------------------------------------------------------------------
 // wxPanel creation


@@ -112,7 +105,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -124,10 +117,13 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 

-#ifdef __WXMSW__
-    // panels don't have the same colour as normal windows under Windows
-    SetDefaultBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-#endif // __WXMSW__
+    // so that non-solid background renders correctly under GTK+:
+    SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif

 
     return true;
 }
 
     return true;
 }


@@ -147,22 +143,12 @@ void wxPanel::InitDialog()
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
-

 void wxPanel::OnSize(wxSizeEvent& event)
 {
     if (GetAutoLayout())
         Layout();
 #if wxUSE_CONSTRAINTS
 void wxPanel::OnSize(wxSizeEvent& event)
 {
     if (GetAutoLayout())
         Layout();
 #if wxUSE_CONSTRAINTS

-#if defined(__WXPM__)
+#if defined(__WXPM__) && 0

     else
     {
         // Need to properly move child windows under OS/2
     else
     {
         // Need to properly move child windows under OS/2


@@ -174,8 +160,8 @@ void wxPanel::OnSize(wxSizeEvent& event)
             // Uninitialized
 
             ::WinQueryWindowPos(GetHWND(), pWinSwp);
             // Uninitialized
 
             ::WinQueryWindowPos(GetHWND(), pWinSwp);

-       }
-       else
+        }
+        else

         {
             SWP                     vSwp;
             int                     nYDiff;
         {
             SWP                     vSwp;
             int                     nYDiff;


@@ -192,4 +178,3 @@ void wxPanel::OnSize(wxSizeEvent& event)
 
     event.Skip();
 }
 
     event.Skip();
 }

-