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 ce2d4ae642108be77b3a7f4a54bddfd6e12bf4ca..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
 {


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

-  virtual void SetFieldsCount(int number=1, const int widths[] = NULL);
+  virtual void SetFieldsCount(int number=1, const int widths[] = (const int *) NULL);

   inline int GetFieldsCount() const { return m_nFields; }
 
   // Set status line text
   inline int GetFieldsCount() const { return m_nFields; }
 
   // Set status line text


@@ -58,7 +60,7 @@ public:
   virtual void DrawField(wxDC& dc, int i);
 
   // Get the position and size of the field's internal bounding rectangle
   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() const { return m_borderX; }
   inline int GetBorderY() const { return m_borderY; }
 
   inline int GetBorderX() const { return m_borderX; }
   inline int GetBorderY() const { return m_borderY; }