Changeset 44

Timestamp:

04/12/06 14:01:14 (3 years ago)

Author:

jordi

Message:

Now when the "Go To Page" is unsensitived, ALL the tool item is sensitived otherwise the label would focus the attention.

Location:

trunk/src/gtk

Files:

• MainView.cxx (modified) (4 diffs)
• MainView.h (modified) (2 diffs)

trunk/src/gtk/MainView.cxx

@@ -138 +138 @@
     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
     // Add the current page tool item.
-    GtkToolItem *currentPage = createCurrentPage ();
-    gtk_toolbar_insert (GTK_TOOLBAR (toolBar), currentPage, CURRENT_PAGE_POS);
+    createCurrentPage ();
+    gtk_toolbar_insert (GTK_TOOLBAR (toolBar), m_CurrentPageToolItem,
+                        CURRENT_PAGE_POS);
     gtk_toolbar_insert (GTK_TOOLBAR (toolBar), gtk_separator_tool_item_new (),
                         CURRENT_PAGE_POS + 1);
@@ -254 +255 @@
 MainView::sensitiveGoToPage (gboolean sensitive)
 {
-    gtk_widget_set_sensitive (m_CurrentPage, sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (m_CurrentPageToolItem), sensitive);
 }
 
@@ -389 +390 @@
 /// @return The tool item to add to the toolbar.
 ///
-GtkToolItem *
+void
 MainView::createCurrentPage ()
 {
-    GtkWidget *hbox = gtk_hbox_new (0, FALSE);
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 3);
     
     GtkWidget *pageLabel= gtk_label_new (_("Page"));
@@ -404 +405 @@
     gtk_box_pack_start (GTK_BOX (hbox), m_CurrentPage, TRUE, TRUE, 0);
     
-    GtkToolItem *toolItem = gtk_tool_item_new ();
-    gtk_container_add (GTK_CONTAINER (toolItem), hbox);
-
-    return toolItem;
+    m_CurrentPageToolItem = gtk_tool_item_new ();
+    gtk_container_add (GTK_CONTAINER (m_CurrentPageToolItem), hbox);
 }
 

trunk/src/gtk/MainView.h

@@ -56 +56 @@
         protected:
             GtkWidget *m_CurrentPage;
+            GtkToolItem *m_CurrentPageToolItem;
             GtkWidget *m_MainWindow; 
             GtkWidget *m_MainBox;
@@ -63 +64 @@
             GtkUIManager *m_UIManager;
 
-            GtkToolItem *createCurrentPage (void);
+            void createCurrentPage (void);
             void createPageView (void);
             void createUIManager (void);