Fix wxWrapSizer minimal size calculation.

[wxWidgets.git] / include / wx / cocoa / control.h

diff --git a/include/wx/cocoa/control.h b/include/wx/cocoa/control.h
index ce13947692571e8dd0021b9b0693722fc5aa73e8..c83ea77760615bfaa4f2a3aeb70b993f5966174e 100644 (file)
--- a/include/wx/cocoa/control.h
+++ b/include/wx/cocoa/control.h
@@ -18,7 +18,7 @@
 // wxControl
 // ========================================================================
 
 // wxControl
 // ========================================================================
 

-class WXDLLEXPORT wxControl : public wxControlBase, public wxCocoaNSControl
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxCocoaNSControl

 {
     DECLARE_ABSTRACT_CLASS(wxControl)
     WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView)
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
     WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView)


@@ -63,6 +63,15 @@ public:
     virtual void CocoaSetEnabled(bool enable);
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void CocoaSetEnabled(bool enable);
 protected:
     virtual wxSize DoGetBestSize() const;

+
+    // Provides a common implementation of title setting which strips mnemonics
+    // and then calls setTitle: with the stripped string.  May be implemented
+    // to call setTitleWithMnemonic: on OpenStep-compatible systems.  Only
+    // intended for use by views or cells which implement at least setTitle:
+    // and possibly setTitleWithMnemonic: such as NSBox and NSButton or NSCell
+    // classes, for example as used by wxRadioBox.  Not usable with classes like
+    // NSTextField which expect setStringValue:.
+    static void CocoaSetLabelForObject(const wxString& labelWithWxMnemonic, struct objc_object *anObject);

 };
 
 #endif
 };
 
 #endif