X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b87bd6c0b694fa7634e7a16ed030033ff8e8bdd..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/generic/panelg.h?ds=sidebyside

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 3c815485f2..9b87ee1a39 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -12,33 +12,48 @@
 #ifndef _WX_GENERIC_PANELG_H_
 #define _WX_GENERIC_PANELG_H_
 
+#include "wx/bitmap.h"
+
 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
     wxPanel() { }
 
-    // Old-style constructor (no default values for coordinates to avoid
-    // ambiguity with the new one)
+    // Constructor
     wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+        Create(parent, winid, pos, size, style, name);
     }
 
-    // Constructor
+#ifdef WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
+            int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Create(parent, winid, pos, size, style, name);
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
     }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
+
+protected:
+    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp);
 
 private:
+    // Event handler for erasing the background which is only used when we have
+    // a valid background bitmap.
+    void OnEraseBackground(wxEraseEvent& event);
+
+
+    // The bitmap used for painting the background if valid.
+    wxBitmap m_bitmapBg;
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };