Added wxTolBar::etMargins

Checklistbox update


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/tbargtk.h

@@ -113,7 +113,7 @@ class wxToolBar: public wxControl
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     
-    virtual void Realize(void);
+    virtual bool Realize(void);
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
@@ -124,15 +124,30 @@ class wxToolBar: public wxControl
 
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
+    virtual wxSize GetToolMargins(void) { return wxSize(m_xMargin, m_yMargin); }
+    
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
+    virtual int GetToolPacking();
+    virtual int GetToolSeparation();
+    
+    virtual wxString GetToolLongHelp(int toolIndex);
+    virtual wxString GetToolShortHelp(int toolIndex);
+    
+    virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
+    virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
 
   // implementation
   
     GtkToolbar   *m_toolbar;
+    int           m_separation;
     wxList        m_tools;
+    
     GdkColor      m_fg;
     GdkColor      m_bg;
+    int           m_xMargin;
+    int           m_yMargin;
+    bool          m_hasToolAlready;
 };
 
 #endif

include/wx/gtk1/tbargtk.h

@@ -113,7 +113,7 @@ class wxToolBar: public wxControl
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     
-    virtual void Realize(void);
+    virtual bool Realize(void);
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
@@ -124,15 +124,30 @@ class wxToolBar: public wxControl
 
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
+    virtual wxSize GetToolMargins(void) { return wxSize(m_xMargin, m_yMargin); }
+    
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
+    virtual int GetToolPacking();
+    virtual int GetToolSeparation();
+    
+    virtual wxString GetToolLongHelp(int toolIndex);
+    virtual wxString GetToolShortHelp(int toolIndex);
+    
+    virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
+    virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
 
   // implementation
   
     GtkToolbar   *m_toolbar;
+    int           m_separation;
     wxList        m_tools;
+    
     GdkColor      m_fg;
     GdkColor      m_bg;
+    int           m_xMargin;
+    int           m_yMargin;
+    bool          m_hasToolAlready;
 };
 
 #endif

samples/controls/controls.cpp

@@ -28,7 +28,6 @@
 #include "wx/imaglist.h"
 #include "wx/spinbutt.h"
 #include "wx/clipbrd.h"
-#include "wx/checklst.h"
 
 // XPM doesn't seem to work under Windows at present. Or, wxNotebook images
 // aren't working.
@@ -209,8 +208,6 @@ const int  ID_SLIDER            = 181;
 
 const int  ID_SPIN              = 182;
 
-const int  ID_CHECKLIST         = 190;
-
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
   EVT_SIZE      (                         MyPanel::OnSize)
@@ -410,14 +407,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_spinbutton->SetRange(0,100);
 
   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
-
-  panel = new wxPanel(m_notebook);
-  panel->SetBackgroundColour("cadet blue");
-  panel->SetForegroundColour("blue");
-  m_listbox = new wxCheckListBox( panel, ID_CHECKLIST, wxPoint(10,10), wxSize(160,70), 5, choices );
-  m_listbox->SetBackgroundColour("wheat");
-  button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
-  m_notebook->AddPage(panel, "wxCheckListBox", FALSE, Image_List);
 }
 
 void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )

samples/toolbar/test.cpp

@@ -72,6 +72,8 @@ bool MyApp::OnInit(void)
   // Create the toolbar
   frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
   
+  frame->GetToolBar()->SetMargins( 2, 2 );
+
   InitToolbar(frame->GetToolBar());
 
   // Force a resize. This should probably be replaced by a call to a wxFrame

src/gtk/checklst.cpp

@@ -77,6 +77,11 @@ void wxCheckListBox::Check( int index, bool check )
 	    
 	gtk_label_set( label, str );
 	    
+	wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
+	event.SetEventObject( this );
+	event.SetInt( index );
+	GetEventHandler()->ProcessEvent( event );
+	
 	return;
     }
     

src/gtk/listbox.cpp

@@ -58,6 +58,28 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
     return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint 
+gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+{
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if (!listbox->HasVMT()) return FALSE;
+
+    if (gdk_event->keyval != ' ') return FALSE;
+    
+    int sel = listbox->GetIndex( widget );
+    
+    wxCheckListBox *clb = (wxCheckListBox *)listbox;
+    
+    clb->Check( sel, !clb->IsChecked(sel) );
+    
+    return FALSE;
+}
+
 //-----------------------------------------------------------------------------
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
@@ -173,6 +195,11 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 	                        "button_press_event",
                                 (GtkSignalFunc)gtk_listbox_button_press_callback, 
 				(gpointer) this );
+				
+            gtk_signal_connect( GTK_OBJECT(list_item), 
+	                        "key_press_event",
+                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
+				(gpointer)this );
 	}
 	
         ConnectWidget( list_item );	
@@ -235,6 +262,11 @@ void wxListBox::AppendCommon( const wxString &item )
 	                        "button_press_event",
                                 (GtkSignalFunc)gtk_listbox_button_press_callback, 
 				(gpointer) this );
+				
+            gtk_signal_connect( GTK_OBJECT(list_item), 
+	                        "key_press_event",
+                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
+				(gpointer)this );    
     }
 	
     gtk_widget_show( list_item );

src/gtk/tbargtk.cpp

@@ -114,6 +114,10 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
                                               GTK_TOOLBAR_ICONS ) );
 
+    m_separation = 5;
+    gtk_toolbar_set_space_size( m_toolbar, m_separation );
+    m_hasToolAlready = FALSE;
+					      
     m_widget = GTK_WIDGET(m_toolbar);					    
 					    
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
@@ -130,7 +134,8 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   
     gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg );
 
-  gtk_toolbar_append_space( m_toolbar );
+    m_xMargin = 0;
+    m_yMargin = 0;
     
     m_parent->AddChild( this );
 
@@ -178,6 +183,8 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {
+    m_hasToolAlready = TRUE;
+    
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
                  "invalid bitmap for wxToolBar icon" );
 
@@ -193,8 +200,6 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   
-  if (TRUE) // FIXME huh?
-  {
     GdkPixmap *pixmap = bitmap.GetPixmap();
 
     GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -202,7 +207,6 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
-  }
   
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
@@ -244,7 +248,7 @@ void wxToolBar::ClearTools()
     wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
 }
 
-void wxToolBar::Realize()
+bool wxToolBar::Realize()
 {
     m_x = 0;
     m_y = 0;
@@ -264,7 +268,9 @@ void wxToolBar::Realize()
         node = node->Next();
     }
   
-  m_height += 12;
+    m_height += 5 + 2*m_yMargin;
+   
+    return TRUE;
 }
 
 void wxToolBar::EnableTool(int toolIndex, bool enable)
@@ -348,9 +354,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
     return FALSE;
 }
 
-void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
+void wxToolBar::SetMargins( int x, int y )
 {
-//  wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );
+    wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." );
+    
+    if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
+    
+    m_xMargin = x;
+    m_yMargin = y;
 }
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
@@ -361,5 +372,91 @@ void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 void wxToolBar::SetToolSeparation( int separation )
 {
     gtk_toolbar_set_space_size( m_toolbar, separation );
+    m_separation = separation;
 }
 
+int wxToolBar::GetToolPacking()
+{
+    return 0;
+}
+
+int wxToolBar::GetToolSeparation()
+{
+    return m_separation;
+}
+
+wxString wxToolBar::GetToolLongHelp(int toolIndex)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            return tool->m_longHelpString;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return "";
+}
+
+wxString wxToolBar::GetToolShortHelp(int toolIndex)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            return tool->m_shortHelpString;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return "";
+}
+
+void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            tool->m_longHelpString = helpString;
+	    return;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return;
+}
+
+void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            tool->m_shortHelpString = helpString;
+	    return;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return;
+}
+
+

src/gtk1/checklst.cpp

@@ -77,6 +77,11 @@ void wxCheckListBox::Check( int index, bool check )
 	    
 	gtk_label_set( label, str );
 	    
+	wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
+	event.SetEventObject( this );
+	event.SetInt( index );
+	GetEventHandler()->ProcessEvent( event );
+	
 	return;
     }
     

src/gtk1/listbox.cpp

@@ -58,6 +58,28 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
     return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint 
+gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+{
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if (!listbox->HasVMT()) return FALSE;
+
+    if (gdk_event->keyval != ' ') return FALSE;
+    
+    int sel = listbox->GetIndex( widget );
+    
+    wxCheckListBox *clb = (wxCheckListBox *)listbox;
+    
+    clb->Check( sel, !clb->IsChecked(sel) );
+    
+    return FALSE;
+}
+
 //-----------------------------------------------------------------------------
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
@@ -173,6 +195,11 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 	                        "button_press_event",
                                 (GtkSignalFunc)gtk_listbox_button_press_callback, 
 				(gpointer) this );
+				
+            gtk_signal_connect( GTK_OBJECT(list_item), 
+	                        "key_press_event",
+                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
+				(gpointer)this );
 	}
 	
         ConnectWidget( list_item );	
@@ -235,6 +262,11 @@ void wxListBox::AppendCommon( const wxString &item )
 	                        "button_press_event",
                                 (GtkSignalFunc)gtk_listbox_button_press_callback, 
 				(gpointer) this );
+				
+            gtk_signal_connect( GTK_OBJECT(list_item), 
+	                        "key_press_event",
+                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
+				(gpointer)this );    
     }
 	
     gtk_widget_show( list_item );

src/gtk1/tbargtk.cpp

@@ -114,6 +114,10 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
                                               GTK_TOOLBAR_ICONS ) );
 
+    m_separation = 5;
+    gtk_toolbar_set_space_size( m_toolbar, m_separation );
+    m_hasToolAlready = FALSE;
+					      
     m_widget = GTK_WIDGET(m_toolbar);					    
 					    
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
@@ -130,7 +134,8 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   
     gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg );
 
-  gtk_toolbar_append_space( m_toolbar );
+    m_xMargin = 0;
+    m_yMargin = 0;
     
     m_parent->AddChild( this );
 
@@ -178,6 +183,8 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {
+    m_hasToolAlready = TRUE;
+    
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
                  "invalid bitmap for wxToolBar icon" );
 
@@ -193,8 +200,6 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   
-  if (TRUE) // FIXME huh?
-  {
     GdkPixmap *pixmap = bitmap.GetPixmap();
 
     GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -202,7 +207,6 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
-  }
   
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
@@ -244,7 +248,7 @@ void wxToolBar::ClearTools()
     wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
 }
 
-void wxToolBar::Realize()
+bool wxToolBar::Realize()
 {
     m_x = 0;
     m_y = 0;
@@ -264,7 +268,9 @@ void wxToolBar::Realize()
         node = node->Next();
     }
   
-  m_height += 12;
+    m_height += 5 + 2*m_yMargin;
+   
+    return TRUE;
 }
 
 void wxToolBar::EnableTool(int toolIndex, bool enable)
@@ -348,9 +354,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
     return FALSE;
 }
 
-void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
+void wxToolBar::SetMargins( int x, int y )
 {
-//  wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );
+    wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." );
+    
+    if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
+    
+    m_xMargin = x;
+    m_yMargin = y;
 }
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
@@ -361,5 +372,91 @@ void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 void wxToolBar::SetToolSeparation( int separation )
 {
     gtk_toolbar_set_space_size( m_toolbar, separation );
+    m_separation = separation;
 }
 
+int wxToolBar::GetToolPacking()
+{
+    return 0;
+}
+
+int wxToolBar::GetToolSeparation()
+{
+    return m_separation;
+}
+
+wxString wxToolBar::GetToolLongHelp(int toolIndex)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            return tool->m_longHelpString;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return "";
+}
+
+wxString wxToolBar::GetToolShortHelp(int toolIndex)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            return tool->m_shortHelpString;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return "";
+}
+
+void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            tool->m_longHelpString = helpString;
+	    return;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return;
+}
+
+void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
+{
+    wxNode *node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+        if (tool->m_index == toolIndex)
+        { 
+            tool->m_shortHelpString = helpString;
+	    return;
+        }
+        node = node->Next();
+    }
+  
+    wxFAIL_MSG( "wrong toolbar index" );
+    
+    return;
+}
+
+