layout improvement on mac

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index b55b4f6bed9835cd6fdb220d60674300bd59a3a0..235a17c705d9e712ade71fa915dfb099b66713e7 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -55,7 +55,7 @@
     // Put some wx default wxChar* values into wxStrings.
     DECLARE_DEF_STRING(FileSelectorPromptStr);
     DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
-
+    DECLARE_DEF_STRING(DirSelectorPromptStr);
     static const wxString wxPyEmptyString(wxT(""));
 %}
 
@@ -83,6 +83,13 @@ wxString wxSaveFileSelector(const wxString& what,
                             const wxString& default_name = wxPyEmptyString,
                             wxWindow *parent = NULL);
 
+
+wxString wxDirSelector(const wxString& message = wxPyDirSelectorPromptStr,
+                       const wxString& defaultPath = wxPyEmptyString,
+                       long style = wxDD_DEFAULT_STYLE,
+                       const wxPoint& pos = wxDefaultPosition,
+                       wxWindow *parent = NULL);
+
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = wxPyEmptyString,
                            const wxString& default_value = wxPyEmptyString,
@@ -169,6 +176,8 @@ bool wxCheckForInterrupt(wxWindow *wnd);
 void wxFlushEvents();
 #endif
 
+wxWindow* wxGetTopLevelParent(wxWindow *win);
+
 //---------------------------------------------------------------------------
 // Resource System
 
@@ -294,6 +303,15 @@ enum wxSystemFeature
     wxSYS_CAN_ICONIZE_FRAME
 };
 
+// values for different screen designs
+enum wxSystemScreen
+{
+    wxSYS_SCREEN_NONE = 0,  //   not yet defined
+    wxSYS_SCREEN_DESKTOP,   //   >= 800x600
+    wxSYS_SCREEN_SMALL,     //   >= 640x480
+    wxSYS_SCREEN_PDA,       //   >= 320x240
+    wxSYS_SCREEN_TINY       //   <
+};
 
 
 class wxSystemSettings {
@@ -310,6 +328,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 wxSystemScreen GetScreen();
+
+//     // Override default.
+//     static void SetScreen( wxSystemScreen screen );
+
 };
 
 
@@ -572,7 +597,7 @@ public:
     static void SetTimestamp(const wxString& ts);
     static const wxString& GetTimestamp();
 
-    bool GetVerbose() const { return m_bVerbose; }
+    bool GetVerbose() const;
 
     static wxTraceMask GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);
@@ -625,14 +650,6 @@ public:
 };
 
 
-class wxLogNull
-{
-public:
-    wxLogNull();
-    ~wxLogNull();
-};
-
-
 class wxLogChain : public wxLog
 {
 public:
@@ -656,9 +673,19 @@ void wxLogStatus(const wxString& szFormat);
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
 void wxLogSysError(const wxString& szFormat);
 
+// Suspress logging while an instance of this class exists
+class wxLogNull
+{
+public:
+    wxLogNull();
+    ~wxLogNull();
+};
+
+
+
 
 %{
-// A Log class that can be derived from in wxPython
+// A wxLog class that can be derived from in wxPython
 class wxPyLog : public wxLog {
 public:
     wxPyLog() : wxLog() {}