Use a compatible bitmap if a depth of -1 is given

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

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index f6dad4310bb53e8d1e02953cbe5a93e261f40980..59c2f3805fcaf06a3bb6b3778d06dea0a844e239 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);

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


@@ -46,7 +42,7 @@ public:
 
 class wxColourDialog : public wxDialog {
 public:
 
 class wxColourDialog : public wxDialog {
 public:

-    %addtofunc wxColourDialog   "self._setOORInfo(self)"
+    %pythonAppend wxColourDialog   "self._setOORInfo(self)"

 
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
 
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 


@@ -59,7 +55,7 @@ public:
 
 class wxDirDialog : public wxDialog {
 public:
 
 class wxDirDialog : public wxDialog {
 public:

-    %addtofunc wxDirDialog   "self._setOORInfo(self)"
+    %pythonAppend wxDirDialog   "self._setOORInfo(self)"

     
     wxDirDialog(wxWindow* parent,
                 const wxString& message = wxPyDirSelectorPromptStr,
     
     wxDirDialog(wxWindow* parent,
                 const wxString& message = wxPyDirSelectorPromptStr,


@@ -83,7 +79,7 @@ public:
 
 class wxFileDialog : public wxDialog {
 public:
 
 class wxFileDialog : public wxDialog {
 public:

-    %addtofunc wxFileDialog   "self._setOORInfo(self)"
+    %pythonAppend wxFileDialog   "self._setOORInfo(self)"

     
     wxFileDialog(wxWindow* parent,
                  const wxString& message = wxPyFileSelectorPromptStr,
     
     wxFileDialog(wxWindow* parent,
                  const wxString& message = wxPyFileSelectorPromptStr,


@@ -154,7 +150,7 @@ enum { wxCHOICEDLG_STYLE };
 class wxMultiChoiceDialog : public wxDialog
 {
 public:
 class wxMultiChoiceDialog : public wxDialog
 {
 public:

-    %addtofunc wxMultiChoiceDialog   "self._setOORInfo(self)"
+    %pythonAppend wxMultiChoiceDialog   "self._setOORInfo(self)"

     
     wxMultiChoiceDialog(wxWindow *parent,
                         const wxString& message,
     
     wxMultiChoiceDialog(wxWindow *parent,
                         const wxString& message,


@@ -178,7 +174,7 @@ public:
 
 class wxSingleChoiceDialog : public wxDialog {
 public:
 
 class wxSingleChoiceDialog : public wxDialog {
 public:

-    %addtofunc wxSingleChoiceDialog   "self._setOORInfo(self)"
+    %pythonAppend wxSingleChoiceDialog   "self._setOORInfo(self)"

     
     %extend {
         // TODO: ignoring clientData for now...  FIX THIS
     
     %extend {
         // TODO: ignoring clientData for now...  FIX THIS


@@ -206,7 +202,7 @@ public:
 
 class wxTextEntryDialog : public wxDialog {
 public:
 
 class wxTextEntryDialog : public wxDialog {
 public:

-    %addtofunc wxTextEntryDialog   "self._setOORInfo(self)"
+    %pythonAppend wxTextEntryDialog   "self._setOORInfo(self)"

     
     wxTextEntryDialog(wxWindow* parent,
                       const wxString& message,
     
     wxTextEntryDialog(wxWindow* parent,
                       const wxString& message,


@@ -245,7 +241,7 @@ public:
 
 class wxFontDialog : public wxDialog {
 public:
 
 class wxFontDialog : public wxDialog {
 public:

-    %addtofunc wxFontDialog   "self._setOORInfo(self)"
+    %pythonAppend wxFontDialog   "self._setOORInfo(self)"

     
     wxFontDialog(wxWindow* parent, const wxFontData& data);
 
     
     wxFontDialog(wxWindow* parent, const wxFontData& data);
 


@@ -258,7 +254,7 @@ public:
 
 class wxMessageDialog : public wxDialog {
 public:
 
 class wxMessageDialog : public wxDialog {
 public:

-    %addtofunc wxMessageDialog   "self._setOORInfo(self)"
+    %pythonAppend wxMessageDialog   "self._setOORInfo(self)"

     
     wxMessageDialog(wxWindow* parent,
                     const wxString& message,
     
     wxMessageDialog(wxWindow* parent,
                     const wxString& message,


@@ -273,7 +269,7 @@ public:
 
 class wxProgressDialog : public wxFrame {
 public:
 
 class wxProgressDialog : public wxFrame {
 public:

-    %addtofunc wxProgressDialog   "self._setOORInfo(self)"
+    %pythonAppend wxProgressDialog   "self._setOORInfo(self)"

     
     wxProgressDialog(const wxString& title,
                      const wxString& message,
     
     wxProgressDialog(const wxString& title,
                      const wxString& message,


@@ -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);


@@ -372,8 +368,8 @@ public:
 
 class wxFindReplaceDialog : public wxDialog {
 public:
 
 class wxFindReplaceDialog : public wxDialog {
 public:

-    %addtofunc wxFindReplaceDialog     "self._setOORInfo(self)"
-    %addtofunc wxFindReplaceDialog()   ""
+    %pythonAppend wxFindReplaceDialog     "self._setOORInfo(self)"
+    %pythonAppend wxFindReplaceDialog()   ""

 
     wxFindReplaceDialog(wxWindow *parent,
                         wxFindReplaceData *data,
 
     wxFindReplaceDialog(wxWindow *parent,
                         wxFindReplaceData *data,