Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

Browse Source 
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
This commit is contained in:
Karsten Ballüder
1999-01-09 18:00:30 +00:00
parent 12a44087e4
commit 687d733769
5 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/combobox.h
View File

@@ -18,8 +18,6 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_COMBOBOX
#include "wx/object.h" #include "wx/object.h"
#include "wx/control.h" #include "wx/control.h"
@@ -119,10 +117,6 @@ public:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif
// wxUSE_COMBOBOX
#endif #endif
// __GTKCOMBOBOXH__ // __GTKCOMBOBOXH__

6
include/wx/gtk1/combobox.h
View File

@@ -18,8 +18,6 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_COMBOBOX
#include "wx/object.h" #include "wx/object.h"
#include "wx/control.h" #include "wx/control.h"
@@ -119,10 +117,6 @@ public:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif
// wxUSE_COMBOBOX
#endif #endif
// __GTKCOMBOBOXH__ // __GTKCOMBOBOXH__

2
include/wx/intl.h
View File

@@ -36,7 +36,9 @@ typedef unsigned long size_t32;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// gettext() style macro // gettext() style macro
#ifndef WXINTL_NO_GETTEXT_MACRO
#define _(str) wxGetTranslation(str) #define _(str) wxGetTranslation(str)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward decls // forward decls

5
src/gtk/combobox.cpp
View File

@@ -14,8 +14,6 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#if wxUSE_COMBOBOX
#include <wx/intl.h> #include <wx/intl.h>
#include "gdk/gdk.h" #include "gdk/gdk.h"
@@ -543,6 +541,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
(window == GTK_COMBO(m_widget)->button->window ) ); (window == GTK_COMBO(m_widget)->button->window ) );
} }
#endif
// wxUSE_COMBOBOX

5
src/gtk1/combobox.cpp
View File

@@ -14,8 +14,6 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#if wxUSE_COMBOBOX
#include <wx/intl.h> #include <wx/intl.h>
#include "gdk/gdk.h" #include "gdk/gdk.h"
@@ -543,6 +541,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
(window == GTK_COMBO(m_widget)->button->window ) ); (window == GTK_COMBO(m_widget)->button->window ) );
} }
#endif
// wxUSE_COMBOBOX