A bit more or multi-format clipboard.

[wxWidgets.git] / src / gtk1 / tbargtk.cpp

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 6ef615173327ee883383e4c59702e0447038d69a..499cae0d70f94b6d967968ecae3ff8ed76f901a8 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -151,7 +151,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( T("wxToolBar creation failed") );
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );
        return FALSE;
     }
 
@@ -263,13 +263,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
     m_hasToolAlready = TRUE;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
-                 T("invalid bitmap for wxToolBar icon") );
+                 wxT("invalid bitmap for wxToolBar icon") );
 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
-                 T("wxToolBar doesn't support GdkBitmap") );
+                 wxT("wxToolBar doesn't support GdkBitmap") );
 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
-                 T("wxToolBar::Add needs a wxBitmap") );
+                 wxT("wxToolBar::Add needs a wxBitmap") );
   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   
@@ -309,6 +309,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     tool->m_item = item;
 
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    m_width = req.width;
+    m_height = req.height;
+
     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
@@ -326,7 +331,7 @@ void wxToolBar::AddSeparator()
 
 void wxToolBar::ClearTools()
 {
-    wxFAIL_MSG( T("wxToolBar::ClearTools not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
 }
 
 bool wxToolBar::Realize()
@@ -376,7 +381,7 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
@@ -418,7 +423,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const
@@ -431,7 +436,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
   
     return (wxObject*)NULL;
 }
@@ -446,7 +451,7 @@ bool wxToolBar::GetToolState(int toolIndex) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
   
     return FALSE;
 }
@@ -461,14 +466,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
-    wxCHECK_RET( !m_hasToolAlready, T("wxToolBar::SetMargins must be called before adding tool.") );
+    wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );
     
     if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
     
@@ -478,7 +483,7 @@ void wxToolBar::SetMargins( int x, int y )
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
-    wxFAIL_MSG( T("wxToolBar::SetToolPacking not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") );
 }
 
 void wxToolBar::SetToolSeparation( int separation )
@@ -510,9 +515,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex)
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
     
-    return T("");
+    return wxT("");
 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)
@@ -528,9 +533,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex)
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
     
-    return T("");
+    return wxT("");
 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
@@ -547,7 +552,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
     
     return;
 }
@@ -566,7 +571,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
-    wxFAIL_MSG( T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );
     
     return;
 }