fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / osx / carbon / toolbar.cpp

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index d2e2b5cccbf277dc7f06dcea70d56ee743f0a2ae..43248edb9c71ea358711df81c0c5c20b120b5d98 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -159,19 +159,22 @@ public:
         return wxPoint( m_x, m_y );
     }
 
         return wxPoint( m_x, m_y );
     }
 

-    bool DoEnable( bool enable );
+    virtual bool Enable( bool enable );

 
     void UpdateToggleImage( bool toggle );
 
 
     void UpdateToggleImage( bool toggle );
 

-#if wxOSX_USE_NATIVE_TOOLBAR
-    void SetToolbarItemRef( HIToolbarItemRef ref )
+    virtual bool Toggle(bool toggle)

     {
     {

-        if ( m_controlHandle )
-            HideControl( m_controlHandle );
-        if ( m_toolbarItemRef )
-            CFRelease( m_toolbarItemRef );
-
-        m_toolbarItemRef = ref;
+        if ( wxToolBarToolBase::Toggle( toggle ) == false )
+            return false;
+            
+        UpdateToggleImage(toggle);
+        return true;
+    }
+    
+    void UpdateHelpStrings()
+    {
+#if wxOSX_USE_NATIVE_TOOLBAR            

         if ( m_toolbarItemRef )
         {
             wxFontEncoding enc = GetToolBarFontEncoding();
         if ( m_toolbarItemRef )
         {
             wxFontEncoding enc = GetToolBarFontEncoding();


@@ -181,27 +184,37 @@ public:
                 wxCFStringRef( GetShortHelp(), enc ),
                 wxCFStringRef( GetLongHelp(), enc ) );
         }
                 wxCFStringRef( GetShortHelp(), enc ),
                 wxCFStringRef( GetLongHelp(), enc ) );
         }

+#endif

     }
     }

-
-    HIToolbarItemRef GetToolbarItemRef() const
+    
+    virtual bool SetShortHelp(const wxString& help)

     {
     {

-        return m_toolbarItemRef;
+        if ( wxToolBarToolBase::SetShortHelp( help ) == false )
+            return false;
+            
+        UpdateHelpStrings();        
+        return true;

     }
     }

-
-    void SetIndex( CFIndex idx )
+    
+    virtual bool SetLongHelp(const wxString& help)

     {
     {

-        m_index = idx;
+        if ( wxToolBarToolBase::SetLongHelp( help ) == false )
+            return false;
+
+        UpdateHelpStrings();
+        return true;

     }
 
     }
 

-    CFIndex GetIndex() const
+    virtual void SetNormalBitmap(const wxBitmap& bmp) 

     {
     {

-        return m_index;
+        wxToolBarToolBase::SetNormalBitmap(bmp);
+        UpdateToggleImage(CanBeToggled() && IsToggled());

     }
     }

-
+        

     virtual void SetLabel(const wxString& label)
     {
         wxToolBarToolBase::SetLabel(label);
     virtual void SetLabel(const wxString& label)
     {
         wxToolBarToolBase::SetLabel(label);

-
+#if wxOSX_USE_NATIVE_TOOLBAR

         if ( m_toolbarItemRef )
         {
             // strip mnemonics from the label for compatibility with the usual
         if ( m_toolbarItemRef )
         {
             // strip mnemonics from the label for compatibility with the usual


@@ -212,6 +225,34 @@ public:
                 m_toolbarItemRef,
                 wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
         }
                 m_toolbarItemRef,
                 wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
         }

+#endif
+    }
+
+#if wxOSX_USE_NATIVE_TOOLBAR
+    void SetToolbarItemRef( HIToolbarItemRef ref )
+    {
+        if ( m_controlHandle )
+            HideControl( m_controlHandle );
+        if ( m_toolbarItemRef )
+            CFRelease( m_toolbarItemRef );
+
+        m_toolbarItemRef = ref;
+        UpdateHelpStrings();
+    }
+
+    HIToolbarItemRef GetToolbarItemRef() const
+    {
+        return m_toolbarItemRef;
+    }
+
+    void SetIndex( CFIndex idx )
+    {
+        m_index = idx;
+    }
+
+    CFIndex GetIndex() const
+    {
+        return m_index;

     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR
 
     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR
 


@@ -384,8 +425,11 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler )
 
 #endif
 
 
 #endif
 

-bool wxToolBarTool::DoEnable( bool enable )
+bool wxToolBarTool::Enable( bool enable )

 {
 {

+    if ( wxToolBarToolBase::Enable( enable ) == false )
+        return false;
+    

     if ( IsControl() )
     {
         GetControl()->Enable( enable );
     if ( IsControl() )
     {
         GetControl()->Enable( enable );


@@ -457,16 +501,20 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
 {
     if ( toggle )
     {
 {
     if ( toggle )
     {

-        int w = m_bmpNormal.GetWidth();
-        int h = m_bmpNormal.GetHeight();
+        int w = m_bmpNormal.GetWidth() + 6;
+        int h = m_bmpNormal.GetHeight() + 6;

         wxBitmap bmp( w, h );
         wxMemoryDC dc;
 
         dc.SelectObject( bmp );
         wxBitmap bmp( w, h );
         wxMemoryDC dc;
 
         dc.SelectObject( bmp );

-        dc.SetPen( wxPen(*wxBLACK) );
-        dc.SetBrush( wxBrush( *wxLIGHT_GREY ));
-        dc.DrawRectangle( 0, 0, w, h );
-        dc.DrawBitmap( m_bmpNormal, 0, 0, true );
+        wxColour mid_grey_75   = wxColour(128, 128, 128, 196);
+        wxColour light_grey_75 = wxColour(196, 196, 196, 196);
+        dc.GradientFillLinear( wxRect(1, 1, w - 1, h-1),
+                               light_grey_75, mid_grey_75, wxNORTH);
+        wxColour black_50 = wxColour(0, 0, 0, 127);
+        dc.SetPen( wxPen(black_50) );
+        dc.DrawRoundedRectangle( 0, 0, w, h, 1.5 );
+        dc.DrawBitmap( m_bmpNormal, 3, 3, true );

         dc.SelectObject( wxNullBitmap );
         ControlButtonContentInfo info;
         wxMacCreateBitmapButton( &info, bmp );
         dc.SelectObject( wxNullBitmap );
         ControlButtonContentInfo info;
         wxMacCreateBitmapButton( &info, bmp );


@@ -1060,10 +1108,18 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             bResult = true;
 
             SetWindowToolbar( tlw, (HIToolbarRef) m_macToolbar );
             bResult = true;
 
             SetWindowToolbar( tlw, (HIToolbarRef) m_macToolbar );

+            
+            // ShowHideWindowToolbar will make the wxFrame grow
+            // which we don't want in this case
+            wxSize sz = GetParent()->GetSize();

             ShowHideWindowToolbar( tlw, true, false );
             ShowHideWindowToolbar( tlw, true, false );

+            // Restore the orginal size
+            GetParent()->SetSize( sz );
+            

             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );

+            

             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );

-
+    

             m_peer->Move(0,0,0,0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             m_peer->SetVisibility( false );
             m_peer->Move(0,0,0,0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             m_peer->SetVisibility( false );


@@ -1097,6 +1153,8 @@ bool wxToolBar::Realize()
 {
     if (m_tools.GetCount() == 0)
         return false;
 {
     if (m_tools.GetCount() == 0)
         return false;

+    
+    wxSize tlw_sz = GetParent()->GetSize();

 
     int maxWidth = 0;
     int maxHeight = 0;
 
     int maxWidth = 0;
     int maxHeight = 0;


@@ -1190,10 +1248,6 @@ bool wxToolBar::Realize()
             {
                 // since setting the help texts is non-virtual we have to update
                 // the strings now
             {
                 // since setting the help texts is non-virtual we have to update
                 // the strings now

-                HIToolbarItemSetHelpText( hiItemRef,
-                    wxCFStringRef( tool->GetShortHelp(), enc ),
-                    wxCFStringRef( tool->GetLongHelp(), enc ) );
-

                 if ( insertAll || (tool->GetIndex() != currentPosition) )
                 {
                     OSStatus err = noErr;
                 if ( insertAll || (tool->GetIndex() != currentPosition) )
                 {
                     OSStatus err = noErr;


@@ -1309,6 +1363,9 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

+    if (m_macUsesNativeToolbar)
+        GetParent()->SetSize( tlw_sz );
+    

     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         // if not set yet, only one row
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         // if not set yet, only one row


@@ -1407,7 +1464,7 @@ void wxToolBar::MacSuperChangedPosition()
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));


@@ -1421,7 +1478,7 @@ void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 
 void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {
 
 void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));


@@ -1449,7 +1506,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return (wxToolBarToolBase*)NULL;
+    return NULL;

 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )


@@ -1461,22 +1518,19 @@ wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
+void wxToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(enable))

 {
 {

-    if ( t != NULL )
-        ((wxToolBarTool*)t)->DoEnable( enable );
+    // everything already done in the tool's implementation

 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {

-    wxToolBarTool *tool = (wxToolBarTool *)t;
-    if ( ( tool != NULL ) && tool->IsButton() )
-        tool->UpdateToggleImage( toggle );
+    // everything already done in the tool's implementation

 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 {
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 {

-    wxToolBarTool *tool = wx_static_cast( wxToolBarTool*, toolBase );
+    wxToolBarTool *tool = static_cast< wxToolBarTool*>(toolBase );

     if (tool == NULL)
         return false;
 
     if (tool == NULL)
         return false;
 


@@ -1655,12 +1709,12 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {

-    wxFAIL_MSG( wxT("not implemented") );
+    // nothing to do

 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 {
 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 {

-    wxToolBarTool* tool = wx_static_cast( wxToolBarTool*, toolbase );
+    wxToolBarTool* tool = static_cast< wxToolBarTool*>(toolbase );

     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {