wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode

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

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index a5e2638dafafe8623b48df77e0349d6c27643094..bf94a3f405ea77c68014f68ad4e25b4ca794eee9 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -136,7 +136,7 @@ public:
         {
             // separator size
             curSize = GetToolBar()->GetToolSize();
         {
             // separator size
             curSize = GetToolBar()->GetToolSize();

-            if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+            if ( GetToolBar()->GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )

                 curSize.y /= 4;
             else
                 curSize.x /= 4;
                 curSize.y /= 4;
             else
                 curSize.x /= 4;


@@ -315,6 +315,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     if ( impl )
     {
         impl->Action();
     if ( impl )
     {
         impl->Action();


@@ -337,21 +338,25 @@ private:
 
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
 {
 
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
 {

+    wxUnusedVar(toolbar);

     return nil;
 }
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
 {
     return nil;
 }
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
 {

+    wxUnusedVar(toolbar);

     return nil;
 }
 
 - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
 {
     return nil;
 }
 
 - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
 {

+    wxUnusedVar(toolbar);

     return nil;
 }
 
 - (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag
 {
     return nil;
 }
 
 - (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag
 {

+    wxUnusedVar(toolbar);

 #ifdef __LP64__
     wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier longLongValue];
 #else
 #ifdef __LP64__
     wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier longLongValue];
 #else


@@ -393,6 +398,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     if ( impl )
     {
         impl->Action();
     if ( impl )
     {
         impl->Action();


@@ -633,6 +639,7 @@ wxToolBar::~wxToolBar()
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 

+        [(NSToolbar*)m_macToolbar setDelegate:nil];

         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }
         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }


@@ -698,7 +705,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
     {
         WXWindow tlw = MacGetTopLevelWindowRef();
         float toolbarHeight = 0.0;
     {
         WXWindow tlw = MacGetTopLevelWindowRef();
         float toolbarHeight = 0.0;

-        NSRect windowFrame;
+        NSRect windowFrame = NSMakeRect(0, 0, 0, 0);

  
         if(m_macToolbar && [(NSToolbar*)m_macToolbar isVisible])
         {
  
         if(m_macToolbar && [(NSToolbar*)m_macToolbar isVisible])
         {


@@ -783,7 +790,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
     if (usesNative && (m_macToolbar == NULL))
         return bResult;
 
     if (usesNative && (m_macToolbar == NULL))
         return bResult;
 

-    if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
+    if (usesNative && ((GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT|wxTB_BOTTOM)) != 0))

         return bResult;
 
     WXWindow tlw = MacGetTopLevelWindowRef();
         return bResult;
 
     WXWindow tlw = MacGetTopLevelWindowRef();


@@ -901,7 +908,7 @@ bool wxToolBar::Realize()
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y;
 
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y;
 

-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )

         {
             int x1 = x + ( maxToolWidth - cursize.x ) / 2;
             tool->SetPosition( wxPoint(x1, y) );
         {
             int x1 = x + ( maxToolWidth - cursize.x ) / 2;
             tool->SetPosition( wxPoint(x1, y) );


@@ -913,7 +920,7 @@ bool wxToolBar::Realize()
         }
 
         // update the item positioning state
         }
 
         // update the item positioning state

-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )

             y += cursize.y + kwxMacToolSpacing;
         else
             x += cursize.x + kwxMacToolSpacing;
             y += cursize.y + kwxMacToolSpacing;
         else
             x += cursize.x + kwxMacToolSpacing;


@@ -1006,14 +1013,14 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+    if ( GetWindowStyleFlag() & (wxTB_TOP|wxTB_BOTTOM) )

     {
         // if not set yet, only one row
         if ( m_maxRows <= 0 )
             SetRows( 1 );
 
         m_minWidth = maxWidth;
     {
         // if not set yet, only one row
         if ( m_maxRows <= 0 )
             SetRows( 1 );
 
         m_minWidth = maxWidth;

-        maxWidth = tw;
+        // maxHeight = th;

         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_minHeight = m_maxHeight = maxHeight;
     }
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_minHeight = m_maxHeight = maxHeight;
     }


@@ -1024,7 +1031,7 @@ bool wxToolBar::Realize()
             SetRows( GetToolsCount() );
 
         m_minHeight = maxHeight;
             SetRows( GetToolsCount() );
 
         m_minHeight = maxHeight;

-        maxHeight = th;
+        // maxWidth = tw;

         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_minWidth = m_maxWidth = maxWidth;
     }
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_minWidth = m_maxWidth = maxWidth;
     }


@@ -1035,7 +1042,7 @@ bool wxToolBar::Realize()
         bool wantNativeToolbar, ownToolbarInstalled;
 
         // attempt to install the native toolbar
         bool wantNativeToolbar, ownToolbarInstalled;
 
         // attempt to install the native toolbar

-        wantNativeToolbar = ((GetWindowStyleFlag() & wxTB_VERTICAL) == 0);
+        wantNativeToolbar = ((GetWindowStyleFlag() & (wxTB_LEFT|wxTB_BOTTOM|wxTB_RIGHT)) == 0);

         MacInstallNativeToolbar( wantNativeToolbar );
         (void)MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
         if (!ownToolbarInstalled)
         MacInstallNativeToolbar( wantNativeToolbar );
         (void)MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
         if (!ownToolbarInstalled)


@@ -1104,7 +1111,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."));


@@ -1118,7 +1125,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."));


@@ -1146,7 +1153,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 )


@@ -1173,7 +1180,7 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 
 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;
 


@@ -1198,7 +1205,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 wxASSERT( tool->GetControlHandle() == NULL );
                 toolSize.x /= 4;
                 toolSize.y /= 4;
                 wxASSERT( tool->GetControlHandle() == NULL );
                 toolSize.x /= 4;
                 toolSize.y /= 4;

-                if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+                if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )

                     toolrect.size.height = toolSize.y;
                 else
                     toolrect.size.width = toolSize.x;
                     toolrect.size.height = toolSize.y;
                 else
                     toolrect.size.width = toolSize.x;


@@ -1305,7 +1312,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 
 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() )
     {


@@ -1345,7 +1352,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
         wxPoint pt = tool2->GetPosition();
 
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
         wxPoint pt = tool2->GetPosition();
 

-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )

             pt.y -= sz.y;
         else
             pt.x -= sz.x;
             pt.y -= sz.y;
         else
             pt.x -= sz.x;