Use wxGetTranslation() instead of _() in the public headers.

This allows the code in them to compile even when WXINTL_NO_GETTEXT_MACRO is
defined.

Closes #15443.

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index e3d1df925da8941110e9dee1e3d92a810184d75d..1a16e14050d573d5948356b2099e95e1b830da34 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -583,12 +583,12 @@ public:
 
         // returns the size in a human readable form
     wxString
 
         // returns the size in a human readable form
     wxString

-    GetHumanReadableSize(const wxString& nullsize = _("Not available"),
+    GetHumanReadableSize(const wxString& nullsize = wxGetTranslation("Not available"),

                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,

-                         const wxString& nullsize = _("Not available"),
+                         const wxString& nullsize = wxGetTranslation("Not available"),

                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 6f4efe5a8c201fb7ffaadd012db2a2170fcd9ac0..1c25d36926e1dcc18d790b090c2a3f1059feb4c4 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -49,7 +49,7 @@ inline bool wxOleInitialize()
     // needs non-default mode.
     if ( hr != RPC_E_CHANGED_MODE && FAILED(hr) )
     {
     // needs non-default mode.
     if ( hr != RPC_E_CHANGED_MODE && FAILED(hr) )
     {

-        wxLogError(_("Cannot initialize OLE"));
+        wxLogError(wxGetTranslation("Cannot initialize OLE"));

 
         return false;
     }
 
         return false;
     }

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index f2d640f481de179e6d40742a37262654a7a5e082..a6f22fa098f41ac399185ee5e429a7683d7c69e8 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -260,7 +260,7 @@ private:
 class WXDLLIMPEXP_CORE wxPrintout: public wxObject
 {
 public:
 class WXDLLIMPEXP_CORE wxPrintout: public wxObject
 {
 public:

-    wxPrintout(const wxString& title = _("Printout"));
+    wxPrintout(const wxString& title = wxGetTranslation("Printout"));

     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);
     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);


@@ -392,7 +392,7 @@ class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,

-                   const wxString& title = _("Print Preview"),
+                   const wxString& title = wxGetTranslation("Print Preview"),

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,

diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h
index 5036897a2565b74311aa368748a7bae816206d87..1fbc96428ffad29107265cefa1be3e437c00c985 100644 (file)
--- a/include/wx/richmsgdlg.h
+++ b/include/wx/richmsgdlg.h
@@ -26,8 +26,8 @@ public:
                              const wxString& caption,
                              long style )
         : wxGenericMessageDialog( parent, message, caption, style ),
                              const wxString& caption,
                              long style )
         : wxGenericMessageDialog( parent, message, caption, style ),

-          m_detailsExpanderCollapsedLabel( _("&See details") ),
-          m_detailsExpanderExpandedLabel( _("&Hide details") ),
+          m_detailsExpanderCollapsedLabel( wxGetTranslation("&See details") ),
+          m_detailsExpanderExpandedLabel( wxGetTranslation("&Hide details") ),

           m_checkBoxValue( false )
         { }
 
           m_checkBoxValue( false )
         { }
 

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 771802d7793d65e7f4444cd0c7e78237c24aedc2..a763461545db37e8ff0f49f02900cc1dba2411c7 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -3520,7 +3520,7 @@ public:
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 

-    virtual wxString GetPropertiesMenuLabel() const { return _("&Box"); }
+    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Box"); }

 
 // Accessors
 
 
 // Accessors
 


@@ -4645,7 +4645,7 @@ public:
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 

-    virtual wxString GetPropertiesMenuLabel() const { return _("&Picture"); }
+    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Picture"); }

 
     virtual bool UsesParagraphAttributes() const { return false; }
 
 
     virtual bool UsesParagraphAttributes() const { return false; }
 


@@ -5575,7 +5575,7 @@ public:
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 

-    virtual wxString GetPropertiesMenuLabel() const { return _("&Cell"); }
+    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Cell"); }

 
 // Accessors
 
 
 // Accessors
 


@@ -5665,7 +5665,7 @@ public:
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 
 
     virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
 

-    virtual wxString GetPropertiesMenuLabel() const { return _("&Table"); }
+    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Table"); }

 
     // Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject
     // is possible. For example, containers supporting text, such as a text box object, can accept the focus,
 
     // Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject
     // is possible. For example, containers supporting text, such as a text box object, can accept the focus,

diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index 3a0b91491f57d6a109c30bb36abdae58310a5c05..e7e5bf25fe32b05c9eb39d755650b4141a59a46f 100644 (file)
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL

-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_TITLE _("Object Properties")
+#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_TITLE wxGetTranslation("Object Properties")

 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_IDNAME ID_RICHTEXTOBJECTPROPERTIESDIALOG
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_POSITION wxDefaultPosition
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_IDNAME ID_RICHTEXTOBJECTPROPERTIESDIALOG
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_POSITION wxDefaultPosition

diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 4fe242e6720a189f7c5d8c7b8a723e1c91dcee36..5dceccf31962be4d46507cc45296f2d27310588a 100644 (file)
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -106,7 +106,7 @@ private:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrintout : public wxPrintout
 {
 public:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrintout : public wxPrintout
 {
 public:

-    wxRichTextPrintout(const wxString& title = _("Printout"));
+    wxRichTextPrintout(const wxString& title = wxGetTranslation("Printout"));

     virtual ~wxRichTextPrintout();
 
     /// The buffer to print
     virtual ~wxRichTextPrintout();
 
     /// The buffer to print


@@ -160,7 +160,7 @@ private:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrinting : public wxObject
 {
 public:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrinting : public wxObject
 {
 public:

-    wxRichTextPrinting(const wxString& name = _("Printing"), wxWindow *parentWindow = NULL);
+    wxRichTextPrinting(const wxString& name = wxGetTranslation("Printing"), wxWindow *parentWindow = NULL);

     virtual ~wxRichTextPrinting();
 
     /// Preview the file or buffer
     virtual ~wxRichTextPrinting();
 
     /// Preview the file or buffer

diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index 6e9f90cf203356c3ec9523e2f3d2edb2ccff4e59..d8bea2630e00b609b77437fdd4106fa1f0de3edb 100644 (file)
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -44,7 +44,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX

-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE _("Style Organiser")
+#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE wxGetTranslation("Style Organiser")

 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME ID_RICHTEXTSTYLEORGANISERDIALOG
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION wxDefaultPosition
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME ID_RICHTEXTSTYLEORGANISERDIALOG
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION wxDefaultPosition

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index e8e2d427cb389e46913e3674cc9826074d412179..1bde4228a7284b8cd23bbf2c582a12f12e4a1d0b 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -44,7 +44,7 @@ public:
     {
         if ( pipe(m_fds) == -1 )
         {
     {
         if ( pipe(m_fds) == -1 )
         {

-            wxLogSysError(_("Pipe creation failed"));
+            wxLogSysError(wxGetTranslation("Pipe creation failed"));

 
             return false;
         }
 
             return false;
         }

diff --git a/include/wx/xtiprop.h b/include/wx/xtiprop.h
index e7357c44d8a47ec4c8e6f79daccda662edbc6cab..18626f2982984dabc7f9e19a8da77459f61534f1 100644 (file)
--- a/include/wx/xtiprop.h
+++ b/include/wx/xtiprop.h
@@ -176,7 +176,7 @@ public:
         if ( m_setter ) 
             m_setter->Set( object, value ); 
         else 
         if ( m_setter ) 
             m_setter->Set( object, value ); 
         else 

-            wxLogError( _("SetProperty called w/o valid setter") ); 
+            wxLogError( wxGetTranslation("SetProperty called w/o valid setter") ); 

     }
 
     // Getting a simple property (non-collection)
     }
 
     // Getting a simple property (non-collection)


@@ -185,7 +185,7 @@ public:
         if ( m_getter ) 
             m_getter->Get( object, result ); 
         else 
         if ( m_getter ) 
             m_getter->Get( object, result ); 
         else 

-            wxLogError( _("GetProperty called w/o valid getter") ); 
+            wxLogError( wxGetTranslation("GetProperty called w/o valid getter") ); 

     }
 
     // Adding an element to a collection property
     }
 
     // Adding an element to a collection property


@@ -194,7 +194,7 @@ public:
         if ( m_adder ) 
             m_adder->Add( object, value ); 
         else 
         if ( m_adder ) 
             m_adder->Add( object, value ); 
         else 

-            wxLogError( _("AddToPropertyCollection called w/o valid adder") ); 
+            wxLogError( wxGetTranslation("AddToPropertyCollection called w/o valid adder") ); 

     }
 
     // Getting a collection property
     }
 
     // Getting a collection property


@@ -203,7 +203,7 @@ public:
         if ( m_collectionGetter ) 
             m_collectionGetter->Get( obj, result); 
         else 
         if ( m_collectionGetter ) 
             m_collectionGetter->Get( obj, result); 
         else 

-            wxLogError( _("GetPropertyCollection called w/o valid collection getter") ); 
+            wxLogError( wxGetTranslation("GetPropertyCollection called w/o valid collection getter") ); 

     }
 
     virtual bool HasSetter() const { return m_setter != NULL; }
     }
 
     virtual bool HasSetter() const { return m_setter != NULL; }


@@ -256,14 +256,14 @@ public:
     virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), 
                                          const wxAny &WXUNUSED(value)) const
     { 
     virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), 
                                          const wxAny &WXUNUSED(value)) const
     { 

-        wxLogError( _("AddToPropertyCollection called on a generic accessor") ); 
+        wxLogError( wxGetTranslation("AddToPropertyCollection called on a generic accessor") ); 

     }
 
     // Getting a collection property
     virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), 
                                         wxAnyList &WXUNUSED(result)) const
     { 
     }
 
     // Getting a collection property
     virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), 
                                         wxAnyList &WXUNUSED(result)) const
     { 

-        wxLogError ( _("GetPropertyCollection called on a generic accessor") ); 
+        wxLogError ( wxGetTranslation("GetPropertyCollection called on a generic accessor") ); 

     }
 
 private:
     }
 
 private: