X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/330043b46d2d7fc6ff855f0073ad33d3d637a289..9739d9ee8090965862ba623b09a8fba731dc3d5c:/include/wx/generic/statusbr.h diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index ce2d4ae642..0c85830028 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -17,8 +17,10 @@ #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 { @@ -44,7 +46,7 @@ public: 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 @@ -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 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; }