fixed some paths in build scripts

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index eb1c5a8eb0283656f3af650ae950c02263a1bc4d..59ad1076ada237779e47df499b56fb849fc00776 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -86,7 +86,7 @@ wxString wxSaveFileSelector(const wxString& what,
 
 wxString wxDirSelector(const wxString& message = wxPyDirSelectorPromptStr,
                        const wxString& defaultPath = wxPyEmptyString,
-                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+                       long style = wxDD_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,
                        wxWindow *parent = NULL);
 
@@ -162,9 +162,6 @@ void wxSetCursor(wxCursor& cursor);
 //----------------------------------------------------------------------
 // Miscellaneous functions
 
-wxWindow * wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL);
-wxWindow * wxFindWindowByName(const wxString& name, wxWindow *parent=NULL);
-
 void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
 wxWindow * wxGetActiveWindow();
 
@@ -176,6 +173,8 @@ bool wxCheckForInterrupt(wxWindow *wnd);
 void wxFlushEvents();
 #endif
 
+wxWindow* wxGetTopLevelParent(wxWindow *win);
+
 //---------------------------------------------------------------------------
 // Resource System
 
@@ -301,6 +300,15 @@ enum wxSystemFeature
     wxSYS_CAN_ICONIZE_FRAME
 };
 
+enum wxSystemScreenType
+{
+    wxSYS_SCREEN_NONE = 0,  //   not yet defined
+
+    wxSYS_SCREEN_TINY,      //   <
+    wxSYS_SCREEN_PDA,       //   >= 320x240
+    wxSYS_SCREEN_SMALL,     //   >= 640x480
+    wxSYS_SCREEN_DESKTOP    //   >= 800x600
+};
 
 
 class wxSystemSettings {
@@ -317,6 +325,13 @@ public:
     // 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 wxSystemScreenType GetScreenType();
+
+   // Override default.
+   static void SetScreenType( wxSystemScreenType screen );
+
 };
 
 
@@ -655,6 +670,12 @@ void wxLogStatus(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
 {