Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 3c815485f218bc4ab94f31c12ae800ada53d4149..6bd2ad6073c67ce8f2370818260ae7dcb5b2a568 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -12,31 +12,35 @@
 #ifndef _WX_GENERIC_PANELG_H_
 #define _WX_GENERIC_PANELG_H_
 
 #ifndef _WX_GENERIC_PANELG_H_
 #define _WX_GENERIC_PANELG_H_
 

+#include "wx/bitmap.h"
+

 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
     wxPanel() { }
 
 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,
     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)
     {
             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
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(

     wxPanel(wxWindow *parent,
     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)
     {
             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

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