r65 - in trunk/src/target/OM-2007: examples/openmoko-paned-demo libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Mon Oct 2 10:31:25 CEST 2006
Author: mickey
Date: 2006-10-02 08:31:24 +0000 (Mon, 02 Oct 2006)
New Revision: 65
Modified:
trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c
trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h
trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.h
trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
Log:
fix header bug in mokoui
Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c 2006-09-30 13:05:40 UTC (rev 64)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c 2006-10-02 08:31:24 UTC (rev 65)
@@ -116,13 +116,13 @@
gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), window);
gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), window);
gtk_action_group_add_radio_actions (action_group, radio_entries, G_N_ELEMENTS (radio_entries), 0, print_selected, window);
-
+
GtkUIManager* ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-
+
GtkAccelGroup* accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
+
GError* error = NULL;
if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description, -1, &error))
{
@@ -130,7 +130,7 @@
g_error_free (error);
exit (EXIT_FAILURE);
}
-
+
return gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
}
@@ -148,8 +148,8 @@
MokoPanedWindow* window = MOKO_PANED_WINDOW(moko_paned_window_new());
/* application menu */
- GtkMenu* appmenu = gtk_menu_new();
- GtkMenuItem* closeitem = gtk_menu_item_new_with_label( "Close" );
+ GtkMenu* appmenu = GTK_MENU(gtk_menu_new());
+ GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Close" ));
g_signal_connect( G_OBJECT(closeitem), "activate", G_CALLBACK(gtk_main_quit), NULL );
gtk_menu_shell_append( appmenu, closeitem );
moko_paned_window_set_application_menu( window, appmenu );
@@ -161,6 +161,9 @@
GtkButton* navigationlist = gtk_button_new_with_label( "Hello Navigation Area!" );
moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigationlist) );
+ /* tool bar */
+ MokoToolBar* toolbar = MOKO_TOOLBAR(moko_tool_bar_new());
+
/* details area */
GtkButton* detailslist = gtk_button_new_with_label( "Hello Details Area!" );
moko_paned_window_set_lower_pane( window, GTK_WIDGET(detailslist) );
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h 2006-09-30 13:05:40 UTC (rev 64)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h 2006-10-02 08:31:24 UTC (rev 65)
@@ -26,10 +26,10 @@
G_BEGIN_DECLS
#define MOKO_TYPE_MENUBAR (moko_menu_bar_get_type())
-#define MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENUBAR, MokoMenuBar))
-#define MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENUBAR, MokoMenuBarClass))
-#define IS_MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENUBAR))
-#define IS_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_MENUBAR))
+#define MOKO_MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENUBAR, MokoMenuBar))
+#define MOKO_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENUBAR, MokoMenuBarClass))
+#define IS_MOKO_MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENUBAR))
+#define IS_MOKO_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_MENUBAR))
typedef struct _MokoMenuBar MokoMenuBar;
typedef struct _MokoMenuBarClass MokoMenuBarClass;
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.h 2006-09-30 13:05:40 UTC (rev 64)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.h 2006-10-02 08:31:24 UTC (rev 65)
@@ -22,6 +22,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkmenu.h>
+#include <gtk/gtktoolbar.h>
#include "moko-window.h"
G_BEGIN_DECLS
@@ -54,10 +55,14 @@
/* add additional methods here */
void moko_paned_window_set_application_menu(MokoPanedWindow* self, GtkMenu* menu);
+//TODO GtkMenu* moko_paned_window_get_application_menu(MokoPanedWindow* self);
void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child);
void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child);
+void moko_paned_window_add_toolbar(MokoPanedWindow* self, GtkToolbar* toolbar);
+//TODO void moko_paned_window_remove_toolbar(MokoPanedWindow* self, GtkToolbar* toolbar);
+
G_END_DECLS
#endif /* _MOKO_PANED_WINDOW_H_ */
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h 2006-09-30 13:05:40 UTC (rev 64)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h 2006-10-02 08:31:24 UTC (rev 65)
@@ -26,10 +26,10 @@
G_BEGIN_DECLS
#define MOKO_TYPE_TOOLBAR (moko_tool_bar_get_type())
-#define TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_TOOLBAR, MokoToolBar))
-#define TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_TOOLBAR, MokoToolBarClass))
-#define IS_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_TOOLBAR))
-#define IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_TOOLBAR))
+#define MOKO_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_TOOLBAR, MokoToolBar))
+#define MOKO_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_TOOLBAR, MokoToolBarClass))
+#define IS_MOKO_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_TOOLBAR))
+#define IS_MOKO_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_TOOLBAR))
typedef struct _MokoToolBar MokoToolBar;
typedef struct _MokoToolBarClass MokoToolBarClass;
More information about the commitlog
mailing list
