X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d9b77552eeb78e0c7ee903aa265dc187651ff57..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/msw/statline.h?ds=sidebyside diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index 9fe6273bcb..6422b1c06a 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -11,7 +11,7 @@ #ifndef _WX_MSW_STATLINE_H_ #define _WX_MSW_STATLINE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -21,16 +21,14 @@ class WXDLLEXPORT wxStaticLine : public wxStaticLineBase { - DECLARE_DYNAMIC_CLASS(wxStaticLine) - public: // constructors and pseudo-constructors wxStaticLine() { } wxStaticLine( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ) { @@ -38,14 +36,20 @@ public: } bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ); // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + virtual bool AcceptsFocus() const { return false; } + +protected: + // usually overridden base class virtuals + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine) }; #endif // _WX_MSW_STATLINE_H_