X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/os2/statline.h?ds=inline diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h index 0b4b2d8341..3b2ff75484 100644 --- a/include/wx/os2/statline.h +++ b/include/wx/os2/statline.h @@ -8,8 +8,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_MSW_STATLINE_H_ -#define _WX_MSW_STATLINE_H_ +#ifndef _WX_OS2_STATLINE_H_ +#define _WX_OS2_STATLINE_H_ #ifdef __GNUG__ #pragma interface @@ -21,30 +21,70 @@ class WXDLLEXPORT wxStaticLine : public wxStaticLineBase { - DECLARE_DYNAMIC_CLASS(wxStaticLine) public: // constructors and pseudo-constructors wxStaticLine() { } + wxStaticLine( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxLI_HORIZONTAL + ,const wxString& rsName = wxStaticTextNameStr + ) + { + Create(pParent, vId, rPos, rSize, lStyle, rsName); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxLI_HORIZONTAL + ,const wxString& rsName = wxStaticTextNameStr + ); + + inline bool IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); } + inline static int GetDefaultSize(void) { return 2; } - wxStaticLine( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticTextNameStr ) + // + // Overriden base class virtuals + // + inline virtual bool AcceptsFocus(void) const {return FALSE;} + +protected: + inline wxSize AdjustSize(const wxSize& rSize) const { - Create(parent, id, pos, size, style, name); + wxSize vSizeReal( rSize.x + ,rSize.y + ); + + if (IsVertical()) + { + if (rSize.x == -1 ) + vSizeReal.x = GetDefaultSize(); + } + else + { + if (rSize.y == -1) + vSizeReal.y = GetDefaultSize(); + } + return vSizeReal; } - bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticTextNameStr ); -}; + inline wxSize DoGetBestSize(void) const { return (AdjustSize(wxDefaultSize)); } + + // + // Usually overridden base class virtuals + // + virtual WXDWORD OS2GetStyle( long lStyle + ,WXDWORD* pdwExstyle + ) const; + +private: + DECLARE_DYNAMIC_CLASS(wxStaticLine) +}; // end of CLASS wxStaticLine -#endif // _WX_MSW_STATLINE_H_ +#endif // _WX_OS2_STATLINE_H_