Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/panel.h b/include/wx/panel.h
index 396a2af9cf4ce4657a426cab1a0f3cdabeb0def5..8f22d180fe26698eadc4328c09d1032fd7bd70b2 100644 (file)
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -28,10 +28,10 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
 // wxPanel contains other controls and implements TAB traversal between them
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow
+class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
 {
 public:
-    wxPanelBase();
+    wxPanelBase() { }
 
     // Derived classes should also provide this constructor:
     /*
@@ -57,11 +57,7 @@ public:
 
     virtual void InitDialog();
 
-    WX_DECLARE_CONTROL_CONTAINER();
-
 private:
-    wxDECLARE_EVENT_TABLE();
-
     wxDECLARE_NO_COPY_CLASS(wxPanelBase);
 };
 
@@ -70,6 +66,7 @@ private:
 #elif defined(__WXMSW__)
     #include "wx/msw/panel.h"
 #else
+    #define wxHAS_GENERIC_PANEL
     #include "wx/generic/panelg.h"
 #endif