X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7fc54becc0a72fa5b8c8bb30f4e087f93ad83d3..0815db26866a57eb72dbda72cc060e2649da45f5:/wxPython/src/misc2.i

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 64e505ac8d..59ad1076ad 100644
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -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();
 
@@ -303,14 +300,14 @@ enum wxSystemFeature
     wxSYS_CAN_ICONIZE_FRAME
 };
 
-// values for different screen designs
-enum wxSystemScreen
+enum wxSystemScreenType
 {
     wxSYS_SCREEN_NONE = 0,  //   not yet defined
-    wxSYS_SCREEN_DESKTOP,   //   >= 800x600
-    wxSYS_SCREEN_SMALL,     //   >= 640x480
+
+    wxSYS_SCREEN_TINY,      //   <
     wxSYS_SCREEN_PDA,       //   >= 320x240
-    wxSYS_SCREEN_TINY       //   <
+    wxSYS_SCREEN_SMALL,     //   >= 640x480
+    wxSYS_SCREEN_DESKTOP    //   >= 800x600
 };
 
 
@@ -328,12 +325,12 @@ 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 wxSystemScreen GetScreen();
+   // Get system screen design (desktop, pda, ..) used for
+   // laying out various dialogs.
+   static wxSystemScreenType GetScreenType();
 
-//     // Override default.
-//     static void SetScreen( wxSystemScreen screen );
+   // Override default.
+   static void SetScreenType( wxSystemScreenType screen );
 
 };
 
@@ -673,12 +670,9 @@ 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
-
-// TODO:  Why am I getting a link error on this???
-// void wxSafeShowMessage(const wxString& title, const wxString& text);
+void wxSafeShowMessage(const wxString& title, const wxString& text);