Changeset 1be21d4c9b1bd3382ad5718f864668d8434ca7b1

Timestamp:

07/24/08 11:57:25 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

6d22f6a41b1d32ed68760f2f5ceb6411cc45c49f

Children:

e1624d68b9dc680736c70f027849a9ccbd38b00f

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-07-24T11:57:25Z+0200

Message:

Fixed build if atkmm is not enabled in gtkmm

2008-07-24 Armin Burgmeier <armin@…>

• src/joindialog.cpp:
• src/hostdialog.cpp: Added #ifdef GTKMM_ATKMM_ENABLED ... #endif pairs around the atkmm includes and usages, so that gobby builds when atkmm is not enabled in gtkmm.

Files:

• ChangeLog (modified) (1 diff)
• src/hostdialog.cpp (modified) (3 diffs)
• src/joindialog.cpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2008-07-24  Armin Burgmeier  <armin@0x539.de>
+
+        * src/joindialog.cpp:
+        * src/hostdialog.cpp: Added #ifdef GTKMM_ATKMM_ENABLED ... #endif
+        pairs around the atkmm includes and usages, so that gobby builds
+        when atkmm is not enabled in gtkmm.
+
 2008-06-25  Yarek Tyshchenko  <yarek@britishgraphics.co.uk>
 

src/hostdialog.cpp

@@ -19 +19 @@
 #include <list>
 #include <gtkmm/stock.h>
+
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/relationset.h>
 #include <atkmm/relation.h>
 #include <atkmm/object.h>
+#endif
+
 #include "common.hpp"
 #include "hostdialog.hpp"
@@ -128 +132 @@
         set_resizable(false);
 
+#ifdef GTKMM_ATKMM_ENABLED
         // Add label associations to get proper accessibility.
         m_lbl_port.get_accessible()->get_relation_set()->set_add(
@@ -149 +154 @@
                         Atk::RELATION_LABEL_FOR)
                 );
+#endif
 }
 

src/joindialog.cpp

@@ -22 +22 @@
 #include <gtkmm/enums.h>
 #include <gtkmm/alignment.h>
+
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/relationset.h>
 #include <atkmm/relation.h>
 #include <atkmm/object.h>
+#endif
+
 #include "common.hpp"
 #include "joindialog.hpp"
@@ -154 +158 @@
         set_resizable(true);
 
+#ifdef GTKMM_ATKMM_ENABLED
         // Add label associations to get proper accessibility.
         m_lbl_host.get_accessible()->get_relation_set()->set_add(
@@ -175 +180 @@
                         Atk::RELATION_LABEL_FOR)
                 );
+#endif
 }