reverted previous commit; include wx/timer.h in wxBase instead

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 214c510dcd9c754e67149bd3f6ff517b8714fc78..088e2dc6dd7e1c9ae0dc70e6622fef34f30367be 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -33,6 +33,7 @@
 #include <wx/mimetype.h>
 #include <wx/snglinst.h>
 #include <wx/effects.h>
+#include <wx/sysopt.h>
 %}
 
 //----------------------------------------------------------------------
@@ -72,6 +73,9 @@ wxString wxFileSelector(const wxString& message = wxPyFileSelectorPromptStr,
                         wxWindow *parent = NULL,
                         int x = -1, int y = -1);
 
+// TODO: wxFileSelectorEx
+
+
 // Ask for filename to load
 wxString wxLoadFileSelector(const wxString& what,
                             const wxString& extension,
@@ -171,7 +175,7 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
 
 #ifdef __WXMSW__
 bool wxCheckForInterrupt(wxWindow *wnd);
-void wxFlushEvents();
+// link error? void wxFlushEvents();
 #endif
 
 wxWindow* wxGetTopLevelParent(wxWindow *win);
@@ -341,6 +345,23 @@ public:
 
 
 
+class wxSystemOptions : public wxObject
+{
+public:
+    wxSystemOptions() { }
+
+    // User-customizable hints to wxWindows or associated libraries
+    // These could also be used to influence GetSystem... calls, indeed
+    // to implement SetSystemColour/Font/Metric
+
+    static void SetOption(const wxString& name, const wxString& value);
+    %name(SetOptionInt)static void SetOption(const wxString& name, int value);
+    static wxString GetOption(const wxString& name) ;
+    static int GetOptionInt(const wxString& name) ;
+    static bool HasOption(const wxString& name) ;
+};
+
+
 //---------------------------------------------------------------------------
 // wxToolTip
 
@@ -1699,6 +1720,26 @@ public:
 
 //----------------------------------------------------------------------
 
+%{
+#ifdef __WXMSW__
+#include <wx/msw/private.h>
+#endif
+%}
+
+%inline %{
+
+void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc)
+{
+#ifdef __WXMSW__
+    ::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
+//     ::SendMessage(GetHwndOf(window), WM_PRINTCLIENT, (long)GetHdcOf(dc),
+//                   PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN );
+#endif
+}
+
+%}
+//----------------------------------------------------------------------
+
 
 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");