Fix the build on amd64.

Reported by:	pointyhat via kris
This commit is contained in:
Joe Marcus Clarke 2007-01-14 20:20:54 +00:00
parent 9588baf82d
commit 0eb614fd65
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=182368
8 changed files with 128 additions and 0 deletions

View File

@ -0,0 +1,21 @@
--- gtk/gtkmm/notebook.cc.orig Sun Jan 14 15:16:24 2007
+++ gtk/gtkmm/notebook.cc Sun Jan 14 15:16:33 2007
@@ -796,7 +796,7 @@ gboolean Notebook_Class::focus_tab_callb
return RType();
}
-void Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
+gboolean Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -829,6 +829,9 @@ void Notebook_Class::change_current_page
if(base && base->change_current_page)
(*base->change_current_page)(self, p0);
}
+
+ typedef gboolean RType;
+ return RType();
}
void Notebook_Class::move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0)

View File

@ -0,0 +1,11 @@
--- gtk/gtkmm/private/notebook_p.h.orig Sun Jan 14 15:17:36 2007
+++ gtk/gtkmm/private/notebook_p.h Sun Jan 14 15:17:46 2007
@@ -36,7 +36,7 @@ protected:
static void switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1);
static gboolean select_page_callback(GtkNotebook* self, gboolean p0);
static gboolean focus_tab_callback(GtkNotebook* self, GtkNotebookTab p0);
- static void change_current_page_callback(GtkNotebook* self, gint p0);
+ static gboolean change_current_page_callback(GtkNotebook* self, gint p0);
static void move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0);
//Callbacks (virtual functions):

View File

@ -0,0 +1,11 @@
--- gtk/gtkmm/private/scrolledwindow_p.h.orig Sun Jan 14 15:17:41 2007
+++ gtk/gtkmm/private/scrolledwindow_p.h Sun Jan 14 15:17:46 2007
@@ -33,7 +33,7 @@ protected:
//Callbacks (default signal handlers):
//These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
//You could prevent the original default signal handlers being called by overriding the *_impl method.
- static void scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
+ static gboolean scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
static void move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0);
//Callbacks (virtual functions):

View File

@ -0,0 +1,21 @@
--- gtk/gtkmm/scrolledwindow.cc.orig Sun Jan 14 15:16:30 2007
+++ gtk/gtkmm/scrolledwindow.cc Sun Jan 14 15:16:33 2007
@@ -166,7 +166,7 @@ void ScrolledWindow_Class::class_init_fu
}
-void ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
+gboolean ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -200,6 +200,9 @@ void ScrolledWindow_Class::scroll_child_
if(base && base->scroll_child)
(*base->scroll_child)(self, p0, p1);
}
+
+ typedef gboolean RType;
+ return RType();
}
void ScrolledWindow_Class::move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0)

View File

@ -0,0 +1,21 @@
--- gtk/gtkmm/notebook.cc.orig Sun Jan 14 15:16:24 2007
+++ gtk/gtkmm/notebook.cc Sun Jan 14 15:16:33 2007
@@ -796,7 +796,7 @@ gboolean Notebook_Class::focus_tab_callb
return RType();
}
-void Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
+gboolean Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -829,6 +829,9 @@ void Notebook_Class::change_current_page
if(base && base->change_current_page)
(*base->change_current_page)(self, p0);
}
+
+ typedef gboolean RType;
+ return RType();
}
void Notebook_Class::move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0)

View File

@ -0,0 +1,11 @@
--- gtk/gtkmm/private/notebook_p.h.orig Sun Jan 14 15:17:36 2007
+++ gtk/gtkmm/private/notebook_p.h Sun Jan 14 15:17:46 2007
@@ -36,7 +36,7 @@ protected:
static void switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1);
static gboolean select_page_callback(GtkNotebook* self, gboolean p0);
static gboolean focus_tab_callback(GtkNotebook* self, GtkNotebookTab p0);
- static void change_current_page_callback(GtkNotebook* self, gint p0);
+ static gboolean change_current_page_callback(GtkNotebook* self, gint p0);
static void move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0);
//Callbacks (virtual functions):

View File

@ -0,0 +1,11 @@
--- gtk/gtkmm/private/scrolledwindow_p.h.orig Sun Jan 14 15:17:41 2007
+++ gtk/gtkmm/private/scrolledwindow_p.h Sun Jan 14 15:17:46 2007
@@ -33,7 +33,7 @@ protected:
//Callbacks (default signal handlers):
//These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
//You could prevent the original default signal handlers being called by overriding the *_impl method.
- static void scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
+ static gboolean scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
static void move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0);
//Callbacks (virtual functions):

View File

@ -0,0 +1,21 @@
--- gtk/gtkmm/scrolledwindow.cc.orig Sun Jan 14 15:16:30 2007
+++ gtk/gtkmm/scrolledwindow.cc Sun Jan 14 15:16:33 2007
@@ -166,7 +166,7 @@ void ScrolledWindow_Class::class_init_fu
}
-void ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
+gboolean ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -200,6 +200,9 @@ void ScrolledWindow_Class::scroll_child_
if(base && base->scroll_child)
(*base->scroll_child)(self, p0, p1);
}
+
+ typedef gboolean RType;
+ return RType();
}
void ScrolledWindow_Class::move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0)