wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 784a03a288ebb50f8ef1a095701642f8bf0aecf1..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
 {


@@ -35,7 +37,7 @@ public:
       Create(parent, id, pos, size, style, name);
   }
 
       Create(parent, id, pos, size, style, name);
   }
 

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

 
   bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -44,24 +46,24 @@ public:
            const wxString& name = wxPanelNameStr);
 
   // Create status line
            const wxString& name = wxPanelNameStr);
 
   // Create status line

-  virtual void SetFieldsCount(int number=1, 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
   virtual void SetStatusText(const wxString& text, int number = 0);
   virtual wxString GetStatusText(int number = 0) const;
 
   // Set status line widths
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
   virtual wxString GetStatusText(int number = 0) const;
 
   // Set status line widths

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

 
   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
 
   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

-  virtual bool GetFieldRect(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 int GetBorderX() const { return m_borderX; }
+  inline int GetBorderY() const { return m_borderY; }

   inline void SetBorderX(int x);
   inline void SetBorderY(int y);
 
   inline void SetBorderX(int x);
   inline void SetBorderY(int y);
 


@@ -70,7 +72,7 @@ public:
 
   void OnPaint(wxPaintEvent& event);
 
 
   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);