Scripts to make a installer package in a disk image for wxPython and

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 235a17c705d9e712ade71fa915dfb099b66713e7..ddcb749eb300f3a19392446e2335f5147e1926df 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -328,12 +328,12 @@ public:
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
 

-//     // Get system screen design (desktop, pda, ..) used for
-//     // laying out various dialogs.
-//     static wxSystemScreen GetScreen();
+   // Get system screen design (desktop, pda, ..) used for
+   // laying out various dialogs.
+   static wxSystemScreen GetScreen();

 
 

-//     // Override default.
-//     static void SetScreen( wxSystemScreen screen );
+   // Override default.
+   static void SetScreen( wxSystemScreen screen );

 
 };
 
 
 };
 


@@ -673,6 +673,12 @@ void wxLogStatus(const wxString& szFormat);
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
 void wxLogSysError(const wxString& szFormat);
 
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
 void wxLogSysError(const wxString& szFormat);
 

+// wxLogFatalError helper: show the (fatal) error to the user in a safe way,
+// i.e. without using wxMessageBox() for example because it could crash
+void wxSafeShowMessage(const wxString& title, const wxString& text);
+
+
+

 // Suspress logging while an instance of this class exists
 class wxLogNull
 {
 // Suspress logging while an instance of this class exists
 class wxLogNull
 {