X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6ebb51430cd8e4a9a11c6c5a5ca7c3ff9d7a72a..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/statline.h diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h index ccab4479ed..76625e51ca 100644 --- a/include/wx/os2/statline.h +++ b/include/wx/os2/statline.h @@ -11,39 +11,75 @@ #ifndef _WX_OS2_STATLINE_H_ #define _WX_OS2_STATLINE_H_ -#ifdef __GNUG__ - #pragma interface -#endif - // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- class WXDLLEXPORT wxStaticLine : public wxStaticLineBase { - DECLARE_DYNAMIC_CLASS(wxStaticLine) public: // constructors and pseudo-constructors wxStaticLine() { } + wxStaticLine( wxWindow* pParent + ,wxWindowID vId = wxID_ANY + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxLI_HORIZONTAL + ,const wxString& rsName = wxStaticLineNameStr + ) + { + Create(pParent, vId, rPos, rSize, lStyle, rsName); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId = wxID_ANY + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxLI_HORIZONTAL + ,const wxString& rsName = wxStaticLineNameStr + ); + + 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_OS2_STATLINE_H_