use wxComboCtrl instead of custom popup window (patch 1575343)

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index e7aca327b121502890a9e9f3470aacc38a49d835..4cdae345f7c762c73ff798b591ba1f8819d15a0c 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -17,31 +17,16 @@
 #if wxUSE_STATUSBAR
 
 #include "wx/pen.h"
-#include "wx/font.h"
-#include "wx/statusbr.h"
 #include "wx/arrstr.h"
 
-extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
-
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
     wxStatusBarGeneric() { Init(); }
     wxStatusBarGeneric(wxWindow *parent,
-                       wxWindowID winid,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = wxFULL_REPAINT_ON_RESIZE,
-                       const wxString& name = wxPanelNameStr)
-    {
-        Init();
-
-        Create(parent, winid, pos, size, style, name);
-    }
-    wxStatusBarGeneric(wxWindow *parent,
-                       wxWindowID winid,
-                       long style,
-                       const wxString& name = wxPanelNameStr)
+                       wxWindowID winid = wxID_ANY,
+                       long style = wxST_SIZEGRIP,
+                       const wxString& name = wxStatusBarNameStr)
     {
         Init();
 
@@ -50,18 +35,9 @@ public:
 
     virtual ~wxStatusBarGeneric();
 
-    bool Create(wxWindow *parent, wxWindowID winid,
-                const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
-                const wxSize& WXUNUSED(size) = wxDefaultSize,
-                long style = wxFULL_REPAINT_ON_RESIZE,
-                const wxString& name = wxPanelNameStr)
-    {
-        return Create(parent, winid, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-                long style,
-                const wxString& name = wxPanelNameStr);
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);
 
     // Create status line
     virtual void SetFieldsCount(int number = 1,