Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h
index 5217bcbcd891342bcd2c5df7fa17efb36be14e36..29537e48ddad55de18d73f13fd5b84c52677f95f 100644 (file)
--- a/include/wx/univ/panel.h
+++ b/include/wx/univ/panel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxUniversal-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
 // Purpose:     wxUniversal-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -20,14 +20,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 public:
     wxPanel() { }
 
 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(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,


@@ -40,6 +32,18 @@ public:
 
     virtual bool IsCanvasWindow() const { return true; }
 
 
     virtual bool IsCanvasWindow() const { return true; }
 

+#if 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
+

 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };