Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / wxPython / src / _cmndlgs.i

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index f6dad4310bb53e8d1e02953cbe5a93e261f40980..e6ae880860e989c7e7eff34e78cde9d7423b0871 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -16,16 +16,12 @@
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

-%{
-
-    DECLARE_DEF_STRING(FileSelectorPromptStr);
-    DECLARE_DEF_STRING(DirSelectorPromptStr);
-    DECLARE_DEF_STRING(DirDialogNameStr);
-    DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
-    DECLARE_DEF_STRING(GetTextFromUserPromptStr);
-    DECLARE_DEF_STRING(MessageBoxCaptionStr);
-
-%}
+MAKE_CONST_WXSTRING(FileSelectorPromptStr);
+MAKE_CONST_WXSTRING(DirSelectorPromptStr);
+MAKE_CONST_WXSTRING(DirDialogNameStr);
+MAKE_CONST_WXSTRING(FileSelectorDefaultWildcardStr);
+MAKE_CONST_WXSTRING(GetTextFromUserPromptStr);
+MAKE_CONST_WXSTRING(MessageBoxCaptionStr);

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -345,7 +341,7 @@ class wxFindDialogEvent : public wxCommandEvent
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     int GetFlags();
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     int GetFlags();

-    wxString GetFindString();
+    const wxString& GetFindString();

     const wxString& GetReplaceString();
     wxFindReplaceDialog *GetDialog();
     void SetFlags(int flags);
     const wxString& GetReplaceString();
     wxFindReplaceDialog *GetDialog();
     void SetFlags(int flags);