wxOS2 build fixes after wxColourBase introduction.

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index c36a0c7cdcc3c30a8b3592b6c243566cfa0d6ce6..06c8ec47914892006881da2fe97336e639638235 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,16 +12,12 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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
 {
@@ -31,7 +27,7 @@ public:
               wxWindowID winid,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = 0,
+              long style = wxFULL_REPAINT_ON_RESIZE,
               const wxString& name = wxPanelNameStr)
   {
       Init();
@@ -53,7 +49,7 @@ public:
   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, winid, style, name);
@@ -93,7 +89,7 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
-  
+
   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 
@@ -115,10 +111,11 @@ 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_NO_COPY(wxStatusBarGeneric)