unicode fixes, enabling notebook images again

[wxWidgets.git] / src / mac / carbon / button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index c67c470acfbe1ce05e35e4712f441df06949b063..253671b6fecd2ffdcab542a648ec84a63f5effb6 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/button.h"
 #include "wx/panel.h"
 
 #include "wx/button.h"
 #include "wx/panel.h"
 


@@ -20,9 +22,11 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 // Button
 
 // Button
 

+static const int kMacOSXHorizontalBorder = 1 ;
+static const int kMacOSXVerticalBorder = 1 ;

 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,


@@ -30,17 +34,26 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
-               kControlPushButtonProc , (long) this ) ;
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-       
-       MacPostControlCreate() ;
+    Rect bounds ;
+    Str255 title ;

 
 

+    if ( UMAHasAquaLayout() )
+    {
+        m_macHorizontalBorder = kMacOSXHorizontalBorder;
+        m_macVerticalBorder = kMacOSXVerticalBorder;
+    }
+    
+    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlPushButtonProc , (long) this ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    
+    MacPostControlCreate() ;
+    

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -48,78 +61,72 @@ void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;

-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
+    if ( parent )

     {
     {

-        btnOldDefault = panel->GetDefaultItem();
-        panel->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
+           wxButton);
+        parent->SetDefaultItem(this);

     }
 
     }
 

-#ifdef __UNIX__
-       Boolean inData;
-       if ( btnOldDefault && btnOldDefault->m_macControl )
-       {
-               inData = 0;
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-       }
-       if ( m_macControl )
-       {
-               inData = 1;
-               UMASetControlData( m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-       }
-#else
-       if ( btnOldDefault && btnOldDefault->m_macControl )
-       {
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
-       }
-       if ( m_macControl )
-       {
-               UMASetControlData( m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
-       }
-#endif
+    Boolean inData;
+    if ( btnOldDefault && btnOldDefault->m_macControl )
+    {
+          inData = 0;
+        ::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }
+    if ( (ControlHandle) m_macControl )
+    {
+          inData = 1;
+        ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }

 }
 
 wxSize wxButton::DoGetBestSize() const
 {
   wxSize sz = GetDefaultSize() ;
   
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
   wxSize sz = GetDefaultSize() ;
   

-    int wBtn = m_label.Length() * 8 + 12 ;
-       int hBtn = 20 ;
-       
+  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+    

   if (wBtn > sz.x) sz.x = wBtn;
   if (wBtn > sz.x) sz.x = wBtn;

-  if (hBtn > sz.y) sz.y = hBtn;

   
   return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
   
   return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
-       int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
+    int wBtn = 70 ; 
+    int hBtn = 20 ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        wBtn += 2 * kMacOSXHorizontalBorder ;
+        hBtn += 2 * kMacOSXVerticalBorder ;
+    }

 
     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
 
     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {

-       if ( m_macControl )
-       {
-               HiliteControl( m_macControl , kControlButtonPart ) ;
-               unsigned long finalTicks ;
-               Delay( 8 , &finalTicks ) ;
-               HiliteControl( m_macControl , 0 ) ;
-       }
+    if ( (ControlHandle) m_macControl )
+    {
+        HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
+        unsigned long finalTicks ;
+        Delay( 8 , &finalTicks ) ;
+        HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
+    }

     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) ) 

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
-    event.SetEventObject(this);
-    ProcessCommand(event);
+    if ( controlpart != kControlNoPart )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+        event.SetEventObject(this);
+        ProcessCommand(event);
+    }

 }
 
 }