Fix XTI compilation in STL build.

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

diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h
index 3e24bd822379abfdfbd732be208b07cbe2d48504..5073fe30baddb903d80e5c32dd84fc0faa3ef737 100644 (file)
--- a/include/wx/msw/panel.h
+++ b/include/wx/msw/panel.h
@@ -11,6 +11,8 @@
 #ifndef _WX_MSW_PANEL_H_
 #define _WX_MSW_PANEL_H_
 
 #ifndef _WX_MSW_PANEL_H_
 #define _WX_MSW_PANEL_H_
 

+class WXDLLIMPEXP_FWD_CORE wxBrush;
+

 // ----------------------------------------------------------------------------
 // wxPanel
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPanel
 // ----------------------------------------------------------------------------


@@ -18,15 +20,7 @@
 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:

-    wxPanel() { }
-
-    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);
-    }
+    wxPanel() { Init(); }

 
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
 
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,


@@ -35,6 +29,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {

+        Init();
+

         Create(parent, winid, pos, size, style, name);
     }
 
         Create(parent, winid, pos, size, style, name);
     }
 


@@ -43,7 +39,31 @@ public:
     // show through the child panels.
     virtual bool HasTransparentBackground();
 
     // show through the child panels.
     virtual bool HasTransparentBackground();
 

+
+#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
+
+protected:
+    void Init()
+    {
+        m_backgroundBrush = NULL;
+    }
+
+    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp);
+    virtual WXHBRUSH MSWGetCustomBgBrush();
+

 private:
 private:

+    wxBrush *m_backgroundBrush;
+

     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };