fixed typo in XRC error message

[wxWidgets.git] / src / osx / cocoa / button.mm

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 789b07d0863be42eb511ac99cfe3862327a0c852..ec396993247ea9a991e6e718f16e77b925a43feb 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -34,7 +34,7 @@ wxSize wxButton::DoGetBestSize() const
     {
         case wxWINDOW_VARIANT_NORMAL:
         case wxWINDOW_VARIANT_LARGE:
     {
         case wxWINDOW_VARIANT_NORMAL:
         case wxWINDOW_VARIANT_LARGE:

-            sz.y = 20 ;
+            sz.y = 23 ;

             break;
 
         case wxWINDOW_VARIANT_SMALL:
             break;
 
         case wxWINDOW_VARIANT_SMALL:


@@ -49,6 +49,21 @@ wxSize wxButton::DoGetBestSize() const
             break;
     }
 
             break;
     }
 

+    wxRect r ;
+        
+    m_peer->GetBestRect(&r);
+
+    if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
+    {
+    }
+    sz.x = r.GetWidth();
+    sz.y = r.GetHeight();
+
+    int wBtn = 96;
+    
+    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
+        sz.x = wBtn;
+

 #if wxOSX_USE_CARBON
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     m_peer->GetBestRect( &bestsize ) ;
 #if wxOSX_USE_CARBON
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     m_peer->GetBestRect( &bestsize ) ;


@@ -111,7 +126,7 @@ wxSize wxButton::GetDefaultSize()
 - (id)initWithFrame:(NSRect)frame
 {
     [super initWithFrame:frame];
 - (id)initWithFrame:(NSRect)frame
 {
     [super initWithFrame:frame];

-    m_impl = NULL;
+    impl = NULL;

     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
     return self;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
     return self;


@@ -119,9 +134,9 @@ wxSize wxButton::GetDefaultSize()
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

-    if ( m_impl )
+    if ( impl )

     {
     {

-        wxButton* wxpeer = (wxButton*) m_impl->GetWXPeer();
+        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();

         if ( wxpeer )
             wxpeer->HandleClicked(0);
     }
         if ( wxpeer )
             wxpeer->HandleClicked(0);
     }


@@ -129,12 +144,12 @@ wxSize wxButton::GetDefaultSize()
 
 - (void)setImplementation: (wxWidgetImpl *) theImplementation
 {
 
 - (void)setImplementation: (wxWidgetImpl *) theImplementation
 {

-    m_impl = theImplementation;
+    impl = theImplementation;

 }
 
 - (wxWidgetImpl*) implementation
 {
 }
 
 - (wxWidgetImpl*) implementation
 {

-    return m_impl;
+    return impl;

 }
 
 - (BOOL) isFlipped
 }
 
 - (BOOL) isFlipped


@@ -185,8 +200,7 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
 {
     NSView* sv = (wxpeer->GetParent()->GetHandle() );
     
 {
     NSView* sv = (wxpeer->GetParent()->GetHandle() );
     

-    NSRect r = wxToNSRect( sv, wxRect( pos, size) );
-    // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
     
     if ( id == wxID_HELP )
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
     
     if ( id == wxID_HELP )


@@ -256,12 +270,33 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
 { 
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
 { 

-    [m_osxView setKeyEquivalent: isDefault ? @"\r" : nil ];
-//    SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) isDefault ) ;
+    if ( [m_osxView isKindOfClass:[NSButton class]] )
+        [(NSButton*)m_osxView setKeyEquivalent: isDefault ? @"\r" : nil ];

 }
 
 void wxWidgetCocoaImpl::PerformClick() 
 {
 }
 
 }
 
 void wxWidgetCocoaImpl::PerformClick() 
 {
 }
 

-// TODO for the disclosure button : NSDisclosureBezelStyle and the button type to NSOnOffButton.
+wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, 
+                                    wxWindowMac* parent, 
+                                    wxWindowID id, 
+                                    const wxString& label,
+                                    const wxPoint& pos, 
+                                    const wxSize& size,
+                                    long style, 
+                                    long extraStyle) 
+{
+    NSView* sv = (wxpeer->GetParent()->GetHandle() );
+    
+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+    [v setBezelStyle:NSDisclosureBezelStyle];
+    [v setButtonType:NSOnOffButton];
+    [v setTitle:wxCFStringRef( label).AsNSString()];
+    [v setImagePosition:NSImageRight];
+    [sv addSubview:v];
+    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    [v setImplementation:c];
+    return c;
+}