X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ebfc214808429624235521bc7946551063e82cb0..a289b10d2ce67a39d5e18d49716afdbcfce2c188:/include/wx/statusbr.h diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index 1a136a0c62..f75d053720 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -37,7 +37,7 @@ WX_DECLARE_LIST(wxString, wxListString); // wxStatusBar: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStatusBarBase : public wxWindow +class WXDLLIMPEXP_CORE wxStatusBarBase : public wxWindow { public: wxStatusBarBase(); @@ -97,10 +97,11 @@ public: // don't want status bars to accept the focus at all virtual bool AcceptsFocus() const { return false; } - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual bool CanBeOutsideClientArea() const { return true; } protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + // set the widths array to NULL void InitWidths(); @@ -157,9 +158,7 @@ protected: #include "wx/palmos/statusbr.h" #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR - #define wxStatusBar95 wxStatusBar - - #include "wx/msw/statbr95.h" + #include "wx/msw/statusbar.h" #elif defined(__WXMAC__) #define wxStatusBarMac wxStatusBar