Merge in from trunk r67662 to r64801

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

diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h
index 5217bcbcd891342bcd2c5df7fa17efb36be14e36..f6bd7c213769ddafbaddc80075a53e17fd85484f 100644 (file)
--- a/include/wx/univ/panel.h
+++ b/include/wx/univ/panel.h
@@ -21,24 +21,35 @@ public:
     wxPanel() { }
 
     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);
     }
 
+    virtual bool IsCanvasWindow() const { return true; }
+
+#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
 
-    virtual bool IsCanvasWindow() const { return true; }
+protected:
+    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp)
+    {
+        // We have support for background bitmap even at the base class level.
+        SetBackground(bmp, wxALIGN_NOT, wxTILE);
+    }
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);