| 1 |
leio 08/09/28 14:00:25 |
| 2 |
|
| 3 |
Added: gtkmm-2.12.7-gtk2_14-compatibility.patch |
| 4 |
Log: |
| 5 |
Fix compatibility with gtk+-2.14, bug 238698 |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gtkmm-2.12.7-gtk2_14-compatibility.patch |
| 15 |
=================================================================== |
| 16 |
http://svn.gnome.org/viewvc/gtkmm/trunk/gtk/src/toolbar.ccg?r1=869&r2=999&view=patch |
| 17 |
with the same repeated for gtk/gtkmm generated sources |
| 18 |
|
| 19 |
Fixes build against gtk+-2.14 to allow gtkmm to be stabled later than gtk+ |
| 20 |
|
| 21 |
--- trunk/gtk/src/toolbar.ccg 2007/07/12 12:41:04 869 |
| 22 |
+++ trunk/gtk/src/toolbar.ccg 2008/07/03 15:09:41 999 |
| 23 |
@@ -20,13 +20,6 @@ |
| 24 |
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 |
*/ |
| 26 |
|
| 27 |
-//Define this to make sure that we don't use any of the deprecated GtkToolbar API. |
| 28 |
-//Normally we just deprecate it in gtkmm too, |
| 29 |
-//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc. |
| 30 |
-//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then. |
| 31 |
- |
| 32 |
-#define GTK_DISABLE_DEPRECATED |
| 33 |
- |
| 34 |
#include <glib.h> |
| 35 |
#include <gtkmm/button.h> |
| 36 |
#include <gtkmm/togglebutton.h> |
| 37 |
@@ -96,7 +89,7 @@ |
| 38 |
Tooltips* Toolbar::get_tooltips_object() const |
| 39 |
{ |
| 40 |
//Note that the _tooltips field is deprecated and broken since GTK+ 2.12: |
| 41 |
- return Glib::wrap((GtkTooltips*)gobj()->_tooltips); |
| 42 |
+ return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips); |
| 43 |
} |
| 44 |
#endif //GTKMM_DISABLE_DEPRECATED |
| 45 |
|
| 46 |
--- trunk/gtk/gtkmm/toolbar.cc 2007/07/12 12:41:04 869 |
| 47 |
+++ trunk/gtk/gtkmm/toolbar.cc 2008/07/03 15:09:41 999 |
| 48 |
@@ -20,13 +20,6 @@ |
| 49 |
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 50 |
*/ |
| 51 |
|
| 52 |
-//Define this to make sure that we don't use any of the deprecated GtkToolbar API. |
| 53 |
-//Normally we just deprecate it in gtkmm too, |
| 54 |
-//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc. |
| 55 |
-//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then. |
| 56 |
- |
| 57 |
-#define GTK_DISABLE_DEPRECATED |
| 58 |
- |
| 59 |
#include <glib.h> |
| 60 |
#include <gtkmm/button.h> |
| 61 |
#include <gtkmm/togglebutton.h> |
| 62 |
@@ -96,7 +89,7 @@ |
| 63 |
Tooltips* Toolbar::get_tooltips_object() const |
| 64 |
{ |
| 65 |
//Note that the _tooltips field is deprecated and broken since GTK+ 2.12: |
| 66 |
- return Glib::wrap((GtkTooltips*)gobj()->_tooltips); |
| 67 |
+ return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips); |
| 68 |
} |
| 69 |
#endif //GTKMM_DISABLE_DEPRECATED |
Archives