ifdef pi which is already defined by Mac OS X

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index fe7a1bfb50b965cd1d82794ad639e011abcc0d51..c5e890f66f9cdf98255f50eef7583a0f5d0d7154 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -22,7 +22,9 @@
 #include <wx/fontenum.h>
 #include <wx/tipdlg.h>
 #include <wx/process.h>
+#ifdef __WXMSW__
 #include <wx/joystick.h>
+#endif
 %}
 
 //----------------------------------------------------------------------
@@ -38,6 +40,10 @@
 %import events.i
 %import streams.i
 
+%{
+    static wxString wxPyEmptyStr("");
+%}
+
 //---------------------------------------------------------------------------
 // Dialog Functions
 
@@ -57,6 +63,11 @@ wxString wxGetTextFromUser(const wxString& message,
                            int x = -1, int y = -1,
                            bool centre = TRUE);
 
+wxString wxGetPasswordFromUser(const wxString& message,
+                               const wxString& caption = wxPyEmptyStr,
+                               const wxString& default_value = wxPyEmptyStr,
+                               wxWindow *parent = NULL);
+
 
 // TODO: Need to custom wrap this one...
 // int wxGetMultipleChoice(char* message, char* caption,
@@ -93,13 +104,22 @@ long wxGetNumberFromUser(const wxString& message,
                          long value,
                          long min = 0, long max = 100,
                          wxWindow *parent = NULL,
-                         const wxPoint& pos = wxPyDefaultPosition);
+                         const wxPoint& pos = wxDefaultPosition);
 
 //---------------------------------------------------------------------------
 // GDI Functions
 
 bool wxColourDisplay();
+
 int wxDisplayDepth();
+int wxGetDisplayDepth();
+
+void wxDisplaySize(int* OUTPUT, int* OUTPUT);
+wxSize wxGetDisplaySize();
+
+void wxDisplaySizeMM(int* OUTPUT, int* OUTPUT);
+wxSize wxGetDisplaySizeMM();
+
 void wxSetCursor(wxCursor& cursor);
 
 //----------------------------------------------------------------------
@@ -364,10 +384,31 @@ public:
 
 //----------------------------------------------------------------------
 
+bool wxSafeYield(wxWindow* win=NULL);
 void wxPostEvent(wxEvtHandler *dest, wxEvent& event);
 void wxWakeUpIdle();
 
-bool wxSafeYield(wxWindow* win=NULL);
+
+#ifdef __WXMSW__
+void wxWakeUpMainThread();
+#endif
+
+void wxMutexGuiEnter();
+void wxMutexGuiLeave();
+
+
+class wxMutexGuiLocker  {
+public:
+    wxMutexGuiLocker();
+    ~wxMutexGuiLocker();
+};
+
+
+%inline %{
+    bool wxThread_IsMain() {
+        return wxThread::IsMain();
+    }
+%}
 
 //----------------------------------------------------------------------
 
@@ -613,6 +654,13 @@ void wxLogSysError(const char *szFormat);
 
 //----------------------------------------------------------------------
 
+
+enum {
+    /* event type */
+    wxEVT_END_PROCESS
+};
+
+
 class wxProcessEvent : public wxEvent {
 public:
     wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0);
@@ -670,6 +718,7 @@ long wxExecute(const wxString& command,
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxJoystick {
 public:
     wxJoystick(int joystick = wxJOYSTICK1);
@@ -719,6 +768,7 @@ public:
     bool SetCapture(wxWindow* win, int pollingFreq = 0);
     bool ReleaseCapture();
 };
+#endif
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------