X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ed97552373524bb54b71cd967b2df135e81ee51..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/cocoa/radiobox.h?ds=sidebyside diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h index e628f593df..69600c8421 100644 --- a/include/wx/cocoa/radiobox.h +++ b/include/wx/cocoa/radiobox.h @@ -18,10 +18,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix); // ======================================================================== // wxRadioBox // ======================================================================== -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxRadioBox) DECLARE_EVENT_TABLE() + // NOTE: We explicitly skip NSControl because our primary cocoa view is + // the NSBox but we want to receive action messages from the NSMatrix. WX_DECLARE_COCOA_OWNER(NSBox,NSView,NSView) // ------------------------------------------------------------------------ // initialization @@ -91,8 +93,9 @@ public: // Cocoa callbacks // ------------------------------------------------------------------------ protected: - // Static boxes cannot be enabled/disabled - virtual void CocoaSetEnabled(bool enable) { } + // Radio boxes cannot be enabled/disabled + virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } + virtual void CocoaTarget_action(void); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ @@ -107,8 +110,29 @@ public: virtual void SetString(unsigned int n, const wxString& label); // change the individual radio button state protected: + // We don't want the typical wxCocoaNSBox behaviour because our real + // implementation is by using an NSMatrix as the NSBox's contentView. WX_NSMatrix GetNSMatrix() const; + void AssociateNSBox(WX_NSBox theBox); + void DisassociateNSBox(WX_NSBox theBox); + virtual wxSize DoGetBestSize() const; + + int GetRowForIndex(int n) const + { + if(m_windowStyle & wxRA_SPECIFY_COLS) + return n / GetMajorDim(); + else + return n % GetMajorDim(); + } + + int GetColumnForIndex(int n) const + { + if(m_windowStyle & wxRA_SPECIFY_COLS) + return n % GetMajorDim(); + else + return n / GetMajorDim(); + } }; #endif // __WX_COCOA_RADIOBOX_H__