X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f3f9b50aa275243ade3541ecccb95de22cf57a9..f2b099261f9e46d65f1fbcfd2a35aa816d5a2818:/include/wx/generic/panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index cbda3af503..9b87ee1a39 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -9,40 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GENERIC_PANEL_H_
-#define _WX_GENERIC_PANEL_H_
+#ifndef _WX_GENERIC_PANELG_H_
+#define _WX_GENERIC_PANELG_H_
 
-// ----------------------------------------------------------------------------
-// headers and forward declarations
-// ----------------------------------------------------------------------------
+#include "wx/bitmap.h"
 
-#include "wx/window.h"
-#include "wx/containr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxControlContainer;
-
-extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
-
-// ----------------------------------------------------------------------------
-// wxPanel contains other controls and implements TAB traversal between them
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxPanel : public wxWindow
+class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
-    wxPanel() { Init(); }
-
-    // Old-style constructor (no default values for coordinates to avoid
-    // ambiguity with the new one)
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Init();
-
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
+    wxPanel() { }
 
     // Constructor
     wxPanel(wxWindow *parent,
@@ -52,46 +27,34 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Init();
-
         Create(parent, winid, pos, size, style, name);
     }
 
-    // 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);
-
-    virtual ~wxPanel();
-
-    // implementation from now on
-    // --------------------------
-
-        // calls layout for layout constraints and sizers
-    void OnSize(wxSizeEvent& event);
-
-    virtual void InitDialog();
+#ifdef WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
+    wxPanel(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
 
-#ifdef __WXUNIVERSAL__
-    virtual bool IsCanvasWindow() const { return true; }
-#endif
+protected:
+    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp);
 
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); }
+private:
+    // Event handler for erasing the background which is only used when we have
+    // a valid background bitmap.
+    void OnEraseBackground(wxEraseEvent& event);
 
-    WX_DECLARE_CONTROL_CONTAINER();
 
-protected:
-    // common part of all ctors
-    void Init();
+    // The bitmap used for painting the background if valid.
+    wxBitmap m_bitmapBg;
 
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
 
-#endif
-    // _WX_GENERIC_PANEL_H_
+#endif // _WX_GENERIC_PANELG_H_