X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4ebf7ba6189c29469eaa8c43717b18d1f61b973..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/os2/radiobox.h diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index 5255f389c3..26c289b6a0 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -13,9 +13,9 @@ #define _WX_RADIOBOX_H_ // List box item -class WXDLLEXPORT wxBitmap ; +class WXDLLIMPEXP_FWD_CORE wxBitmap ; -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase { public: wxRadioBox(); @@ -28,7 +28,7 @@ public: ,int nNum = 0 ,const wxString asChoices[] = NULL ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ) @@ -54,7 +54,7 @@ public: ,const wxSize& rSize ,const wxArrayString& asChoices ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ) @@ -72,7 +72,7 @@ public: ); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create( wxWindow* pParent ,wxWindowID vId @@ -82,7 +82,7 @@ public: ,int nNum = 0 ,const wxString asChoices[] = NULL ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ); @@ -94,15 +94,31 @@ public: ,const wxSize& rSize ,const wxArrayString& asChoices ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ); + // Enabling + virtual bool Enable(bool bEnable = true); + virtual bool Enable(unsigned int nItem, bool bEnable = true); + virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const + { + /* TODO */ + return true; + } + + // Showing + virtual bool Show(bool bShow = true); + virtual bool Show(unsigned int nItem, bool bShow = true); + virtual bool IsItemShown(unsigned int WXUNUSED(n)) const + { + /* TODO */ + return true; + } + void Command(wxCommandEvent& rEvent); bool ContainsHWND(WXHWND hWnd) const; - virtual bool Enable(bool bEnable = true); - virtual bool Enable(int nItem, bool bEnable = true); virtual WXHBRUSH OnCtlColor( WXHDC hDC ,WXHWND hWnd @@ -115,8 +131,6 @@ public: ,WXWORD wId ); void SendNotificationEvent(void); - virtual bool Show(int nItem, bool bShow = true); - virtual bool Show(bool bShow = true); MRESULT WindowProc( WXUINT uMsg ,WXWPARAM wParam ,WXLPARAM lParam @@ -125,24 +139,20 @@ public: - virtual int GetCount(void) const; + virtual unsigned int GetCount() const; inline WXHWND* GetRadioButtons(void) const { return m_ahRadioButtons; } int GetSelection(void) const; - void GetSize( int* pnX - ,int* pnY - ) const; + void GetSize(int* pnX, int* pnY) const; inline int GetSizeFlags(void) const { return m_nSizeFlags; } - wxString GetString(int nIndex) const; + virtual wxString GetString(unsigned int nIndex) const; virtual wxString GetStringSelection(void) const; inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); } void SetFocus(void); virtual bool SetFont(const wxFont& rFont); inline void SetLabelFont(const wxFont& WXUNUSED(font)) {}; - void SetSelection(int nIndex); - virtual void SetString( int nNum - ,const wxString& rsLabel - ); + virtual void SetSelection(int nIndex); + virtual void SetString(unsigned int nNum, const wxString& rsLabel); virtual bool SetStringSelection(const wxString& rsStr); virtual void SetLabel(const wxString& rsLabel) @@ -155,6 +165,7 @@ public: wxString GetLabel(int nItem) const; protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxSize DoGetBestSize(void) const; virtual void DoSetSize( int nX ,int nY @@ -170,12 +181,13 @@ protected: WXHWND* m_ahRadioButtons; int* m_pnRadioWidth; // for bitmaps int* m_pnRadioHeight; - int m_nNoItems; int m_nSelectedButton; int m_nSizeFlags; private: + unsigned int m_nNoItems; + DECLARE_DYNAMIC_CLASS(wxRadioBox) }; // end of wxRadioBox