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 0bfa7daaca81d7b8f9ae60e2ca7c1f546fd5fcfd..8f22d180fe26698eadc4328c09d1032fd7bd70b2 100644 (file)
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -1,7 +1,73 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/panel.h
+// Purpose:     Base header for wxPanel
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+//              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_PANEL_H_BASE_
 #define _WX_PANEL_H_BASE_
 
-#include "wx/generic/panelg.h"
+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
+
+#include "wx/window.h"
+#include "wx/containr.h"
+
+class WXDLLIMPEXP_FWD_CORE wxControlContainer;
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
+
+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
+{
+public:
+    wxPanelBase() { }
+
+    // Derived classes should also provide this constructor:
+    /*
+    wxPanelBase(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                const wxString& name = wxPanelNameStr);
+    */
 
+    // Pseudo ctor
+    bool Create(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                const wxString& name = wxPanelNameStr);
+
+
+    // implementation from now on
+    // --------------------------
+
+    virtual void InitDialog();
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxPanelBase);
+};
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/panel.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/panel.h"
+#else
+    #define wxHAS_GENERIC_PANEL
+    #include "wx/generic/panelg.h"
 #endif
-    // _WX_PANELH_BASE_
+
+#endif // _WX_PANELH_BASE_