adding #ifs for reflecting existing controls, fixing #ifdefs

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index f3208c2e8039750fe11a87a90883865f899174dc..3bff49d8d709497c2e080076093fe53dd74b827f 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -30,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
 // ----------------------------------------------------------------------------


@@ -89,8 +88,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)

-    EVT_SIZE(wxPanel::OnSize)
-

     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
 


@@ -98,7 +95,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

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

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


@@ -106,7 +103,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,


@@ -140,43 +137,3 @@ void wxPanel::InitDialog()
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxPanel::OnSize(wxSizeEvent& event)
-{
-    if (GetAutoLayout())
-        Layout();
-#if wxUSE_CONSTRAINTS
-#if defined(__WXPM__)
-    else
-    {
-        // Need to properly move child windows under OS/2
-
-        PSWP                        pWinSwp = GetSwp();
-
-        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
-        {
-            // Uninitialized
-
-            ::WinQueryWindowPos(GetHWND(), pWinSwp);
-        }
-        else
-        {
-            SWP                     vSwp;
-            int                     nYDiff;
-
-            ::WinQueryWindowPos(GetHWND(), &vSwp);
-            nYDiff = pWinSwp->cy - vSwp.cy;
-            MoveChildren(nYDiff);
-            pWinSwp->cx = vSwp.cx;
-            pWinSwp->cy = vSwp.cy;
-        }
-    }
-#endif
-#endif // wxUSE_CONSTRAINTS
-
-    event.Skip();
-}
-