Renamed GtkMyFixed to GtkPizza,

[wxWidgets.git] / include / wx / intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index e18303f019b6a8978ebc19a4433ff176711924b7..7a3a2a92b2e837faf3b10949d2349519596fb005 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -19,6 +19,8 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

+#if wxUSE_INTL
+

 // ============================================================================
 // global decls
 // ============================================================================
 // ============================================================================
 // global decls
 // ============================================================================


@@ -30,7 +32,7 @@
 // gettext() style macro (notice that xgettext should be invoked with "-k_"
 // option to extract the strings inside _() from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
 // gettext() style macro (notice that xgettext should be invoked with "-k_"
 // option to extract the strings inside _() from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO

-    #define   _(str)  wxGetTranslation(_T(str))
+    #define   _(str)  wxGetTranslation(wxT(str))

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -137,5 +139,15 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
         return (const wxMB2WXbuf)sz;
 }
 
         return (const wxMB2WXbuf)sz;
 }
 

+#else // !wxUSE_INTL
+
+#ifndef WXINTL_NO_GETTEXT_MACRO
+    #define   _(str)  (str)
+#endif
+
+inline const wxChar *wxGetTranslation(const wxChar *sz) { return sz; }
+
+#endif // wxUSE_INTL/!wxUSE_INTL
+

 #endif
     // _WX_INTLH__
 #endif
     // _WX_INTLH__