r2325 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui
zecke at sita.openmoko.org
zecke at sita.openmoko.org
Thu Jun 21 17:04:18 CEST 2007
Author: zecke
Date: 2007-06-21 17:04:15 +0200 (Thu, 21 Jun 2007)
New Revision: 2325
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-ui.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
Log:
2007-06-21 Holger Hans Peter Freyther <zecke at selfish.org>
Remove custom parent_class handling as this is done by
the DEFINE_TYPE macro.
Compile with -Wall -Werror by adding casts, removing inner
functions, adjusting signed-nes, returning values.
The most intrusive change is to cb_size_allocate which makes this
method non-reentrant (I think it wasn't before) and to disable a
couple of DEBUG_THIS_FILE.
* libmokoui/moko-alignment.c:
(moko_alignment_class_init):
* libmokoui/moko-application.c:
* libmokoui/moko-details-window.c:
(moko_details_window_class_init):
* libmokoui/moko-dialog-window.c:
* libmokoui/moko-finger-tool-box.c:
(moko_finger_tool_box_class_init):
(checkstatus):
(cb_size_allocate):
(moko_finger_tool_box_show):
(moko_finger_tool_box_hide):
* libmokoui/moko-finger-wheel.c:
(moko_finger_wheel_class_init):
(moko_finger_wheel_show):
(moko_finger_wheel_hide):
* libmokoui/moko-finger-window.c:
(moko_finger_window_get_geometry_hint):
* libmokoui/moko-fixed.c:
(moko_fixed_class_init):
(moko_fixed_realize):
* libmokoui/moko-menu-box.c:
* libmokoui/moko-message-dialog.c:
(moko_message_dialog_map):
(moko_message_dialog_init):
* libmokoui/moko-paned-window.c:
(moko_paned_window_set_ratio):
(_moko_paned_window_fullscreen_toggled):
* libmokoui/moko-panel-applet.c:
(moko_panel_applet_class_init):
(moko_panel_applet_get_positioning_hint):
* libmokoui/moko-panel-applet.h:
* libmokoui/moko-pixmap-button.c:
* libmokoui/moko-scrolled-pane.c:
(moko_scrolled_pane_class_init):
(moko_scrolled_pane_init):
* libmokoui/moko-tool-box.c:
* libmokoui/moko-tree-view.c:
(moko_tree_view_class_init):
(moko_tree_view_size_request):
* libmokoui/moko-ui.c:
(moko_ui_banner_show_text):
* libmokoui/moko-window.c:
(moko_window_class_init):
(moko_window_notify):
(moko_window_set_status_message):
(moko_window_set_status_progress):
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-21 15:04:15 UTC (rev 2325)
@@ -1,5 +1,63 @@
2007-06-21 Holger Hans Peter Freyther <zecke at selfish.org>
+ Remove custom parent_class handling as this is done by
+ the DEFINE_TYPE macro.
+ Compile with -Wall -Werror by adding casts, removing inner
+ functions, adjusting signed-nes, returning values.
+ The most intrusive change is to cb_size_allocate which makes this
+ method non-reentrant (I think it wasn't before) and to disable a
+ couple of DEBUG_THIS_FILE.
+
+ * libmokoui/moko-alignment.c:
+ (moko_alignment_class_init):
+ * libmokoui/moko-application.c:
+ * libmokoui/moko-details-window.c:
+ (moko_details_window_class_init):
+ * libmokoui/moko-dialog-window.c:
+ * libmokoui/moko-finger-tool-box.c:
+ (moko_finger_tool_box_class_init):
+ (checkstatus):
+ (cb_size_allocate):
+ (moko_finger_tool_box_show):
+ (moko_finger_tool_box_hide):
+ * libmokoui/moko-finger-wheel.c:
+ (moko_finger_wheel_class_init):
+ (moko_finger_wheel_show):
+ (moko_finger_wheel_hide):
+ * libmokoui/moko-finger-window.c:
+ (moko_finger_window_get_geometry_hint):
+ * libmokoui/moko-fixed.c:
+ (moko_fixed_class_init):
+ (moko_fixed_realize):
+ * libmokoui/moko-menu-box.c:
+ * libmokoui/moko-message-dialog.c:
+ (moko_message_dialog_map):
+ (moko_message_dialog_init):
+ * libmokoui/moko-paned-window.c:
+ (moko_paned_window_set_ratio):
+ (_moko_paned_window_fullscreen_toggled):
+ * libmokoui/moko-panel-applet.c:
+ (moko_panel_applet_class_init):
+ (moko_panel_applet_get_positioning_hint):
+ * libmokoui/moko-panel-applet.h:
+ * libmokoui/moko-pixmap-button.c:
+ * libmokoui/moko-scrolled-pane.c:
+ (moko_scrolled_pane_class_init):
+ (moko_scrolled_pane_init):
+ * libmokoui/moko-tool-box.c:
+ * libmokoui/moko-tree-view.c:
+ (moko_tree_view_class_init):
+ (moko_tree_view_size_request):
+ * libmokoui/moko-ui.c:
+ (moko_ui_banner_show_text):
+ * libmokoui/moko-window.c:
+ (moko_window_class_init):
+ (moko_window_notify):
+ (moko_window_set_status_message):
+ (moko_window_set_status_progress):
+
+2007-06-21 Holger Hans Peter Freyther <zecke at selfish.org>
+
Don't require X11 in the OpenMoko API. Make the usage of
xosd a private implementation detail.
Convert MokoBanner to a singleton hopefully similiar to the ones
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -24,19 +24,13 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoAlignment, moko_alignment, GTK_TYPE_ALIGNMENT)
#define MOKO_ALIGNMENT_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_ALIGNMENT, MokoAlignmentPrivate))
-static GtkAlignmentClass* parent_class = NULL;
-
-typedef struct _MokoAlignmentPrivate
-{
-} MokoAlignmentPrivate;
-
/* forward declarations */
static void moko_alignment_realize(GtkWidget* widget);
static void moko_alignment_size_request(GtkWidget* widget, GtkRequisition* requisition);
@@ -47,13 +41,11 @@
moko_alignment_class_init (MokoAlignmentClass *klass)
{
/* hook parent */
- parent_class = g_type_class_peek_parent(klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
/* register private data */
- g_type_class_add_private (klass, sizeof (MokoAlignmentPrivate));
/* hook virtual methods */
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
widget_class->realize = moko_alignment_realize;
widget_class->size_request = moko_alignment_size_request;
widget_class->size_allocate = moko_alignment_size_allocate;
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -18,6 +18,7 @@
* Current Version: $Rev$ ($Date$) [$Author$]
*/
#include "moko-application.h"
+#include "moko-stock.h"
#include <gtk/gtkwidget.h>
#include <gtk/gtkiconfactory.h>
@@ -34,7 +35,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#endif
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -31,20 +31,13 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoDetailsWindow, moko_details_window, GTK_TYPE_SCROLLED_WINDOW)
#define DETAILS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_DETAILS_WINDOW, MokoDetailsWindowPrivate))
-typedef struct _MokoDetailsWindowPrivate
-{
-} MokoDetailsWindowPrivate;
-
-/* parent class pointer */
-static GtkScrolledWindowClass* parent_class = NULL;
-
/* forward declarations */
static void _cb_fullscreen_clicked(GtkButton* button, MokoDetailsWindow* self);
@@ -65,11 +58,8 @@
moko_details_window_class_init (MokoDetailsWindowClass *klass)
{
/* hook parent */
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
/* register private data */
- g_type_class_add_private (klass, sizeof (MokoDetailsWindowPrivate));
/* hook virtual methods */
/* ... */
@@ -77,6 +67,7 @@
/* install properties */
/* ... */
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = moko_details_window_dispose;
object_class->finalize = moko_details_window_finalize;
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -28,12 +28,12 @@
#include <glib/gmain.h>
-#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoDialogWindow, moko_dialog_window, MOKO_TYPE_WINDOW)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -30,7 +30,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoFingerToolBox, moko_finger_tool_box, MOKO_TYPE_ALIGNMENT)
@@ -41,8 +41,6 @@
static void moko_finger_tool_box_show(GtkWidget* widget);
static void moko_finger_tool_box_hide(GtkWidget* widget);
-static MokoAlignmentClass* parent_class = NULL;
-
typedef struct _MokoFingerToolBoxPrivate
{
GdkBitmap* mask;
@@ -62,6 +60,8 @@
GdkPixbuf* button_pixbuf;
GdkPixbuf* rightarrow_pixbuf;
+ guint numChild;
+
} MokoFingerToolBoxPrivate;
static gchar* get_bg_pixmap_name (GtkWidget *widget)
@@ -85,9 +85,6 @@
static void
moko_finger_tool_box_class_init(MokoFingerToolBoxClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
-
/* register private data */
g_type_class_add_private (klass, sizeof (MokoFingerToolBoxPrivate));
@@ -99,51 +96,52 @@
/* install properties */
/* ... */
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = moko_finger_tool_box_dispose;
object_class->finalize = moko_finger_tool_box_finalize;
}
static void
-cb_size_allocate(GtkWidget* widget, GtkAllocation* allocation, MokoFingerToolBox* self)
+checkstatus( GtkWidget* child, MokoFingerToolBox* self )
{
- moko_debug( "size allocate %d, %d, %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
-
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
+ guint maxButtonsPerPage = priv->maxButtonsPerPage;
+ if ( priv->rightArrowVisible ) maxButtonsPerPage--;
- GtkAllocation* a = &(priv->hbox->allocation);
+ moko_debug( "maxButtonsPerPage = %d", maxButtonsPerPage );
- //FIXME get from style
- priv->maxButtonsPerPage = a->width / ( priv->buttonWidth + (INNER_PADDING/2) );
- moko_debug( "-- width % buttonWidth = %d", a->width % priv->buttonWidth );
-
- guint numChild = 0;
-
- void checkstatus( GtkWidget* child, MokoFingerToolBox* self )
+ moko_debug( "child: '%s'", gtk_widget_get_name( child ) );
+ if ( strcmp( "mokofingertoolbox-toolbutton", gtk_widget_get_name( child ) ) == 0 )
{
- MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
- guint maxButtonsPerPage = priv->maxButtonsPerPage;
- if ( priv->rightArrowVisible ) maxButtonsPerPage--;
-
- moko_debug( "maxButtonsPerPage = %d", maxButtonsPerPage );
-
- moko_debug( "child: '%s'", gtk_widget_get_name( child ) );
- if ( strcmp( "mokofingertoolbox-toolbutton", gtk_widget_get_name( child ) ) == 0 )
- {
- if ( numChild < priv->leftButton || numChild > priv->leftButton + maxButtonsPerPage-1 )
+ if ( priv->numChild < priv->leftButton || priv->numChild > priv->leftButton + maxButtonsPerPage-1 )
{
- moko_debug( "hiding child %d", numChild );
- gtk_widget_hide( child );
+ moko_debug( "hiding child %d", priv->numChild );
+ gtk_widget_hide( child );
}
else
{
- moko_debug( "showing child %d", numChild );
- gtk_widget_show( child );
+ moko_debug( "showing child %d", priv->numChild );
+ gtk_widget_show( child );
}
- }
- numChild++;
}
+ priv->numChild++;
+}
+static void
+cb_size_allocate(GtkWidget* widget, GtkAllocation* allocation, MokoFingerToolBox* self)
+{
+ moko_debug( "size allocate %d, %d, %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
+
+ MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
+
+ GtkAllocation* a = &(priv->hbox->allocation);
+
+ //FIXME get from style
+ priv->maxButtonsPerPage = a->width / ( priv->buttonWidth + (INNER_PADDING/2) );
+ moko_debug( "-- width % buttonWidth = %d", a->width % priv->buttonWidth );
+
priv->rightArrowVisible = priv->numberOfButtons > priv->maxButtonsPerPage;
+ priv->numChild = 0;
gtk_container_foreach( GTK_CONTAINER(priv->hbox), (GtkCallback) checkstatus, self );
@@ -284,7 +282,7 @@
{
//gtk_widget_ensure_style( widget ); //FIXME needed here?
moko_debug( "moko_finger_wheel_show" );
- GTK_WIDGET_CLASS(parent_class)->show(widget);
+ GTK_WIDGET_CLASS(moko_finger_tool_box_parent_class)->show(widget);
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(widget);
if ( !priv->popup )
{
@@ -315,7 +313,7 @@
static void moko_finger_tool_box_hide(GtkWidget* widget)
{
moko_debug( "moko_finger_tool_box_hide" );
- GTK_WIDGET_CLASS(parent_class)->hide(widget);
+ GTK_WIDGET_CLASS(moko_finger_tool_box_parent_class)->hide(widget);
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(widget);
gtk_widget_hide( priv->popup );
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -25,12 +25,12 @@
#include <gtk/gtkbutton.h>
#include <gtk/gtkwindow.h>
-#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
enum {
@@ -48,7 +48,6 @@
#define MOKO_FINGER_WHEEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_WHEEL, MokoFingerWheelPrivate))
-static MokoFixedClass *parent_class = NULL;
static guint wheel_signals[LAST_SIGNAL] = { 0 };
typedef struct _MokoFingerWheelPrivate
@@ -82,9 +81,6 @@
static void
moko_finger_wheel_class_init(MokoFingerWheelClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
- parent_class = g_type_class_peek_parent(klass);
-
/* register private data */
g_type_class_add_private( klass, sizeof(MokoFingerWheelPrivate) );
@@ -100,6 +96,7 @@
/* install properties */
/* ... */
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->dispose = moko_finger_wheel_dispose;
object_class->finalize = moko_finger_wheel_finalize;
@@ -215,7 +212,7 @@
{
gtk_widget_ensure_style( widget ); //FIXME needed here?
moko_debug( "moko_finger_wheel_show" );
- GTK_WIDGET_CLASS(parent_class)->show(widget);
+ GTK_WIDGET_CLASS(moko_finger_wheel_parent_class)->show(widget);
MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(widget);
if ( !priv->popup )
{
@@ -276,7 +273,7 @@
static void moko_finger_wheel_hide(GtkWidget* widget)
{
moko_debug( "moko_finger_wheel_hide" );
- GTK_WIDGET_CLASS(parent_class)->hide(widget);
+ GTK_WIDGET_CLASS(moko_finger_wheel_parent_class)->hide(widget);
MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(widget);
gtk_widget_hide( priv->popup );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -34,7 +34,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoFingerWindow, moko_finger_window, MOKO_TYPE_WINDOW)
@@ -135,7 +135,7 @@
int absy;
if (!GTK_WIDGET(self)->window)
- return;
+ return FALSE;
gtk_widget_size_request( hintee, &req );
gdk_window_get_geometry( GTK_WIDGET(self)->window, &x, &y, &w, &h, NULL );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -24,21 +24,13 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoFixed, moko_fixed, GTK_TYPE_FIXED)
#define PIXMAP_CONTAINER_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FIXED, MokoFixedPrivate))
-typedef struct _MokoFixedPrivate MokoFixedPrivate;
-
-struct _MokoFixedPrivate
-{
-};
-
-static GtkFixedClass *parent_class = NULL;
-
/* declare virtual methods */
static void moko_fixed_realize(GtkWidget *widget);
static void moko_fixed_size_request(GtkWidget *widget, GtkRequisition *requisition);
@@ -60,16 +52,11 @@
static void
moko_fixed_class_init (MokoFixedClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-
- /* get pointer to parent */
- parent_class = g_type_class_peek_parent(klass);
-
/* add private data */
- g_type_class_add_private (klass, sizeof (MokoFixedPrivate));
/* hook virtual methods */
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
widget_class->realize = moko_fixed_realize;
widget_class->size_request = moko_fixed_size_request;
widget_class->size_allocate = moko_fixed_size_allocate;
@@ -113,7 +100,7 @@
gint attributes_mask;
if (GTK_WIDGET_NO_WINDOW (widget))
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ GTK_WIDGET_CLASS (moko_fixed_parent_class)->realize (widget);
else
{
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -27,7 +27,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
#define MOKO_MENU_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_MENU_BOX, MokoMenuBoxPriv));
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -104,7 +104,7 @@
* our widget gets drawn onto it.
*/
static void
-moko_message_dialog_map (GObject *object)
+moko_message_dialog_map (GtkWidget *object)
{
MokoMessageDialogPrivate *priv = MESSAGE_DIALOG_PRIVATE (object);
MokoMessageDialog *dialog = MOKO_MESSAGE_DIALOG (object);
@@ -304,7 +304,7 @@
/* Indicate that we want to paint this ourselves */
- gtk_widget_set_app_paintable (self, TRUE);
+ gtk_widget_set_app_paintable (GTK_WIDGET (self), TRUE);
g_signal_connect (self, "realize", G_CALLBACK (moko_message_dialog_realize_cb), NULL);
g_signal_connect (self, "expose-event", G_CALLBACK (moko_message_dialog_expose_event_cb), NULL);
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -29,7 +29,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoPanedWindow, moko_paned_window, MOKO_TYPE_WINDOW)
@@ -138,9 +138,9 @@
{
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
moko_debug( "moko_paned_window_set_ratio" );
- guint height;
+ gint height;
- gtk_window_get_size (GTK_WIDGET (self), NULL, &height);
+ gtk_window_get_size (GTK_WINDOW (self), NULL, &height);
gtk_paned_set_position( GTK_PANED(priv->outerframe), ratio * height / 100 );
}
@@ -207,14 +207,14 @@
static void _moko_paned_window_fullscreen_toggled(MokoScrolledPane* pane, gint b, MokoPanedWindow* self)
{
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
- if ( pane == gtk_bin_get_child( GTK_BIN(priv->lowerenclosing) ) )
+ if ( GTK_WIDGET(pane) == gtk_bin_get_child( GTK_BIN(priv->lowerenclosing) ) )
{
if ( b )
gtk_widget_hide( priv->upper );
else
gtk_widget_show( priv->upper );
}
- else if ( pane == gtk_bin_get_child( GTK_BIN(priv->upperenclosing) ) )
+ else if ( GTK_WIDGET(pane) == gtk_bin_get_child( GTK_BIN(priv->upperenclosing) ) )
{
if ( b )
gtk_widget_hide( priv->lower );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -20,12 +20,12 @@
#include <gtk/gtkmenu.h>
-#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoPanelApplet, moko_panel_applet, GTK_TYPE_ALIGNMENT)
@@ -49,9 +49,6 @@
static guint moko_panel_applet_signals[LAST_SIGNAL] = { 0, };
-/* parent class pointer */
-static GObjectClass* parent_class = NULL;
-
/* forward declarations */
static gboolean cb_moko_panel_applet_button_release_event( GtkWidget* widget, GdkEventButton* event, MokoPanelApplet* self);
void moko_panel_applet_signal_clicked(MokoPanelApplet* self);
@@ -73,10 +70,6 @@
static void
moko_panel_applet_class_init(MokoPanelAppletClass* klass)
{
- /* hook parent */
- GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
-
/* default signal handlers */
klass->clicked = moko_panel_applet_signal_clicked;
klass->tap_hold = moko_panel_applet_signal_tap_hold;
@@ -85,6 +78,7 @@
g_type_class_add_private (klass, sizeof(MokoPanelAppletPrivate));
/* hook destruction */
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
object_class->dispose = moko_panel_applet_dispose;
object_class->finalize = moko_panel_applet_finalize;
@@ -147,8 +141,11 @@
int win_h;
gdk_window_get_geometry( self->toplevelwindow->window, NULL, NULL, &win_w, &win_h, NULL );
moko_debug( "-- popup geom = %d, %d", win_w, win_h );
+
+#ifdef DEBUG_THIS_FILE
GtkAllocation* allocation = &self->toplevelwindow->allocation;
moko_debug( "-- popup alloc = %d, %d", allocation->width, allocation->height );
+#endif
GtkAllocation* applet_alloc = >K_WIDGET(self)->allocation;
moko_debug( "-- applet alloc = %d, %d", applet_alloc->width, applet_alloc->height );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2007-06-21 15:04:15 UTC (rev 2325)
@@ -19,14 +19,6 @@
#ifndef _MOKO_PANEL_APPLET_H_
#define _MOKO_PANEL_APPLET_H_
-#define DEBUG_THIS_FILE
-#ifdef DEBUG_THIS_FILE
-#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
-#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
-#else
-#define moko_debug(fmt,...)
-#endif
-
#include <gtk/gtkalignment.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkimage.h>
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -19,13 +19,15 @@
#include "moko-pixmap-button.h"
#include <gtk/gtkmenu.h>
+#include <gtk/gtkicontheme.h>
+
#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoPixmapButton, moko_pixmap_button, GTK_TYPE_BUTTON)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -23,7 +23,7 @@
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoScrolledPane, moko_scrolled_pane, GTK_TYPE_HBOX)
@@ -38,9 +38,6 @@
GtkWidget* scrollbar; /* GtkScrollBar */
} MokoScrolledPanePrivate;
-/* parent class pointer */
-static GtkHBoxClass* parent_class = NULL;
-
/* signals */
enum {
FULLSCREEN_TOGGLED,
@@ -67,14 +64,11 @@
static void
moko_scrolled_pane_class_init(MokoScrolledPaneClass* klass)
{
- /* hook parent */
- GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
-
/* add private */
g_type_class_add_private (klass, sizeof(MokoScrolledPanePrivate));
/* hook destruction */
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
object_class->dispose = moko_scrolled_pane_dispose;
object_class->finalize = moko_scrolled_pane_finalize;
@@ -82,9 +76,9 @@
moko_scrolled_pane_signals[FULLSCREEN_TOGGLED] = g_signal_new ("fullscreen-toggled",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+ 0,
NULL,
NULL,
- NULL,
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE,
1,
@@ -110,7 +104,7 @@
MokoScrolledPanePrivate* priv = SCROLLED_PANE_GET_PRIVATE(self);
priv->scrolledwindow = gtk_scrolled_window_new( NULL, NULL );
- gtk_scrolled_window_set_policy( priv->scrolledwindow, GTK_POLICY_NEVER, GTK_POLICY_NEVER );
+ gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(priv->scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
priv->vbox = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start( GTK_BOX(self), priv->scrolledwindow, TRUE, TRUE, 0 );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -27,7 +27,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoToolBox, moko_tool_box, GTK_TYPE_NOTEBOOK)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -23,20 +23,13 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
G_DEFINE_TYPE (MokoTreeView, moko_tree_view, GTK_TYPE_TREE_VIEW)
#define TREE_VIEW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_TREE_VIEW, MokoTreeViewPrivate))
-typedef struct _MokoTreeViewPrivate
-{
-} MokoTreeViewPrivate;
-
-/* parent class pointer */
-static GObjectClass* parent_class = NULL;
-
/* forward declarations */
void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition);
@@ -56,12 +49,7 @@
static void
moko_tree_view_class_init (MokoTreeViewClass *klass)
{
- /* hook parent */
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
- parent_class = g_type_class_peek_parent( klass );
-
/* register private data */
- g_type_class_add_private( klass, sizeof (MokoTreeViewPrivate) );
/* hook virtual methods */
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
@@ -70,6 +58,7 @@
/* install properties */
/* ... */
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->dispose = moko_tree_view_dispose;
object_class->finalize = moko_tree_view_finalize;
}
@@ -97,9 +86,9 @@
void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
{
moko_debug( "moko_tree_view_size_request" );
- MokoTreeView* self = MOKO_TREE_VIEW(widget);
- GTK_WIDGET_CLASS(parent_class)->size_request( widget, requisition );
+ GTK_WIDGET_CLASS(moko_tree_view_parent_class)->size_request( widget, requisition );
#if 0 /* it doesn't work with size_request... should we try overwriting size_alloc? */
+ MokoTreeView* self = MOKO_TREE_VIEW(widget);
moko_debug( "-- [old] requesting %d, %d", requisition->width, requisition->height );
// compute height as a whole-number factor of the cell height
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-ui.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-ui.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-ui.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -8,6 +8,6 @@
const gchar* string = g_strdup_vprintf( message, a );
va_end( a );
moko_banner_show_text( moko_banner_get_instance (), string, timeout );
- g_free( string );
+ g_free( (gchar*)string );
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2007-06-21 14:50:08 UTC (rev 2324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2007-06-21 15:04:15 UTC (rev 2325)
@@ -38,7 +38,7 @@
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
-#define moko_debug(fmt,...)
+#define moko_debug(...)
#endif
/* add your signals here */
@@ -60,7 +60,6 @@
static void moko_window_is_topmost_notify(MokoWindow* self);
static guint moko_window_signals[LAST_SIGNAL] = { 0 };
-static GtkWindowClass* parent_class = NULL;
G_DEFINE_TYPE (MokoWindow, moko_window, GTK_TYPE_WINDOW)
@@ -75,16 +74,12 @@
static void moko_window_class_init(MokoWindowClass *klass) /* Class Initialization */
{
moko_debug( "moko_window_class_init" );
- /* GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); */
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
- /* Set the global parent_class here */
- parent_class = g_type_class_peek_parent(klass);
-
/* register private data */
g_type_class_add_private( klass, sizeof(MokoWindowPrivate) );
/* hook virtual methods */
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->set_property = moko_window_set_property;
object_class->get_property = moko_window_get_property;
object_class->notify = moko_window_notify;
@@ -173,8 +168,8 @@
moko_window_is_topmost_notify(window);
}
- if (G_OBJECT_CLASS(parent_class)->notify)
- G_OBJECT_CLASS(parent_class)->notify( gobject, param );
+ if (G_OBJECT_CLASS(moko_window_parent_class)->notify)
+ G_OBJECT_CLASS(moko_window_parent_class)->notify( gobject, param );
}
static void
@@ -243,7 +238,7 @@
XA_STRING,
8,
PropModeReplace,
- message,
+ (guchar*)message,
strlen (message) + 1);
}
@@ -258,6 +253,6 @@
XA_STRING,
8,
PropModeReplace,
- (char *)&progress,
+ (unsigned char *)&progress,
sizeof (progress));
}
More information about the commitlog
mailing list
