made GetPage() not virtual because it doesn't need to be virtual and this allows...

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index f908a144268eab7ce77e29b7b16f1aa0394ea4d6..e7ac4d74096e1e86a9d505ae737475c2cee1f83e 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,53 +12,50 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "statusbr.h"
-#endif
-
 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"
+#include "wx/arrstr.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,
-              wxWindowID id,
+              wxWindowID winid,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = 0,
+              long style = wxFULL_REPAINT_ON_RESIZE,
               const wxString& name = wxPanelNameStr)
   {
       Init();
 
-      Create(parent, id, pos, size, style, name);
+      Create(parent, winid, pos, size, style, name);
   }
   wxStatusBarGeneric(wxWindow *parent,
-                     wxWindowID id,
+                     wxWindowID winid,
                      long style,
                      const wxString& name = wxPanelNameStr)
   {
       Init();
 
-      Create(parent, id, style, name);
+      Create(parent, winid, style, name);
   }
 
   virtual ~wxStatusBarGeneric();
 
-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,
               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,
-              long style = 0,
+              long style = wxFULL_REPAINT_ON_RESIZE,
               const wxString& name = wxPanelNameStr)
   {
-      return Create(parent, id, style, name);
+      return Create(parent, winid, style, name);
   }
 
-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,
               long style,
               const wxString& name = wxPanelNameStr);
 
@@ -92,7 +89,7 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
-  
+
   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 
@@ -114,16 +111,15 @@ protected:
 
   int               m_borderX;
   int               m_borderY;
-  wxFont            m_defaultStatusBarFont;
   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 
+  virtual wxSize DoGetBestSize() const;
+
 private:
   DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxStatusBarGeneric)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
 
 #endif
     // _WX_GENERIC_STATUSBR_H_
-
-// vi:sts=4:sw=4:et