wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

defined). intl.h only defines _() macro if WXINTL_NO_GETTEXT_MACRO is not defined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 5e9e341fb38355ab817aae34038ccbea2e7dced7..7d7822f941e5ca06650818ebf642111109bd8555 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -18,8 +18,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_COMBOBOX
-
 #include "wx/object.h"
 #include "wx/control.h"
 
@@ -119,10 +117,6 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
-#endif
-
-  // wxUSE_COMBOBOX
-
 #endif
 
   // __GTKCOMBOBOXH__

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 5e9e341fb38355ab817aae34038ccbea2e7dced7..7d7822f941e5ca06650818ebf642111109bd8555 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -18,8 +18,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_COMBOBOX
-
 #include "wx/object.h"
 #include "wx/control.h"
 
@@ -119,10 +117,6 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
-#endif
-
-  // wxUSE_COMBOBOX
-
 #endif
 
   // __GTKCOMBOBOXH__

diff --git a/include/wx/intl.h b/include/wx/intl.h
index fd26e1054c7239ef072fec210d2cfd69193bfcad..8b7acb076bf1326be642e81a8a277768982735cb 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -36,7 +36,9 @@ typedef unsigned long size_t32;
 // ----------------------------------------------------------------------------
 
 // gettext() style macro
+#ifndef WXINTL_NO_GETTEXT_MACRO
 #define   _(str)  wxGetTranslation(str)
+#endif
 
 // ----------------------------------------------------------------------------
 // forward decls

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 302a6f5dfff106278350bc59e768fc6124dcecea..499e2153d96960791bf4d8d81a069568e20fd5cb 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -14,8 +14,6 @@
 
 #include "wx/combobox.h"
 
-#if wxUSE_COMBOBOX
-
 #include <wx/intl.h>
 
 #include "gdk/gdk.h"
@@ -543,6 +541,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
-#endif
-
-  // wxUSE_COMBOBOX
\ No newline at end of file

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 302a6f5dfff106278350bc59e768fc6124dcecea..499e2153d96960791bf4d8d81a069568e20fd5cb 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -14,8 +14,6 @@
 
 #include "wx/combobox.h"
 
-#if wxUSE_COMBOBOX
-
 #include <wx/intl.h>
 
 #include "gdk/gdk.h"
@@ -543,6 +541,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
-#endif
-
-  // wxUSE_COMBOBOX
\ No newline at end of file