Many bug fixes for display code:

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 91c4abcac20c046cccdfc110aa1f07d1eb6f4a3e..0c858300287fc764c4793b4f6f7d45ddea17af2d 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -17,8 +17,10 @@
 #endif
 
 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"

+#include "wx/pen.h"
+#include "wx/font.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;

 
 class WXDLLEXPORT wxStatusBar: public wxWindow
 {
 
 class WXDLLEXPORT wxStatusBar: public wxWindow
 {


@@ -26,51 +28,51 @@ class WXDLLEXPORT wxStatusBar: public wxWindow
 
 public:
   wxStatusBar(void);
 
 public:
   wxStatusBar(void);

-  inline wxStatusBar(wxWindow *parent, const wxWindowID id,
+  inline wxStatusBar(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = 0,
+           long style = 0,

            const wxString& name = wxPanelNameStr)
   {
       Create(parent, id, pos, size, style, name);
   }
 
            const wxString& name = wxPanelNameStr)
   {
       Create(parent, id, pos, size, style, name);
   }
 

-  ~wxStatusBar(void);
+  ~wxStatusBar();

 
 

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = 0,
+           long style = 0,

            const wxString& name = wxPanelNameStr);
 
   // Create status line
            const wxString& name = wxPanelNameStr);
 
   // Create status line

-  virtual void SetFieldsCount(const int number=1, const int *widths = NULL);
-  inline int GetFieldsCount(void) const { return m_nFields; }
+  virtual void SetFieldsCount(int number=1, const int widths[] = (const int *) NULL);
+  inline int GetFieldsCount() const { return m_nFields; }

 
   // Set status line text
 
   // Set status line text

-  virtual void SetStatusText(const wxString& text, const int number = 0);
-  virtual wxString GetStatusText(const int number = 0) const;
+  virtual void SetStatusText(const wxString& text, int number = 0);
+  virtual wxString GetStatusText(int number = 0) const;

 
   // Set status line widths
 
   // Set status line widths

-  virtual void SetStatusWidths(const int n, const int *widths_field);
+  virtual void SetStatusWidths(int n, const int widths_field[]);

 
 

-  virtual void DrawFieldText(wxDC& dc, const int i);
-  virtual void DrawField(wxDC& dc, const int i);
+  virtual void DrawFieldText(wxDC& dc, int i);
+  virtual void DrawField(wxDC& dc, int i);

 
   // Get the position and size of the field's internal bounding rectangle
 
   // Get the position and size of the field's internal bounding rectangle

-  virtual bool GetFieldRect(const int i, wxRectangle& rect) const;
+  virtual bool GetFieldRect(int i, wxRect& rect) const;

 
 

-  inline int GetBorderX(void) const { return m_borderX; }
-  inline int GetBorderY(void) const { return m_borderY; }
-  inline void SetBorderX(const int x);
-  inline void SetBorderY(const int y);
+  inline int GetBorderX() const { return m_borderX; }
+  inline int GetBorderY() const { return m_borderY; }
+  inline void SetBorderX(int x);
+  inline void SetBorderY(int y);

 
   ////////////////////////////////////////////////////////////////////////
   // Implementation
 
   void OnPaint(wxPaintEvent& event);
 
 
   ////////////////////////////////////////////////////////////////////////
   // Implementation
 
   void OnPaint(wxPaintEvent& event);
 

-  virtual void InitColours(void);
+  virtual void InitColours();

 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);