added wxCSConv::IsOk() (patch 1637944)

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 99314edecfe45aca9859a4598bcd24e9a7625d68..34c59bb52da38761e7f6dc4126ecd59fd9d9d0db 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/panel.h"
+    #include "wx/containr.h"
 #endif
 
-#include "wx/containr.h"
-#include "wx/panel.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -98,7 +97,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)
 
 // ----------------------------------------------------------------------------
 // wxPanel creation
@@ -179,4 +178,3 @@ void wxPanel::OnSize(wxSizeEvent& event)
 
     event.Skip();
 }
-