Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / panel.h

diff --git a/include/wx/panel.h b/include/wx/panel.h
index 396a2af9cf4ce4657a426cab1a0f3cdabeb0def5..11fc2c6416ca214ff0c5f9988e44a70a7de5a964 100644 (file)
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Author:      Julian Smart
 // Modified by:
 // Created:

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 //              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows Licence
 // Copyright:   (c) Julian Smart
 //              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows Licence


@@ -28,10 +27,10 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
 // wxPanel contains other controls and implements TAB traversal between them
 // ----------------------------------------------------------------------------
 
 // wxPanel contains other controls and implements TAB traversal between them
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow
+class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>

 {
 public:
 {
 public:

-    wxPanelBase();
+    wxPanelBase() { }

 
     // Derived classes should also provide this constructor:
     /*
 
     // Derived classes should also provide this constructor:
     /*


@@ -57,11 +56,7 @@ public:
 
     virtual void InitDialog();
 
 
     virtual void InitDialog();
 

-    WX_DECLARE_CONTROL_CONTAINER();
-

 private:
 private:

-    wxDECLARE_EVENT_TABLE();
-

     wxDECLARE_NO_COPY_CLASS(wxPanelBase);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxPanelBase);
 };
 


@@ -70,6 +65,7 @@ private:
 #elif defined(__WXMSW__)
     #include "wx/msw/panel.h"
 #else
 #elif defined(__WXMSW__)
     #include "wx/msw/panel.h"
 #else

+    #define wxHAS_GENERIC_PANEL

     #include "wx/generic/panelg.h"
 #endif
 
     #include "wx/generic/panelg.h"
 #endif