Version 0.4.1 for wxGTK

[wxWidgets.git] / utils / wxPython / src / misc.i

diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index 8f32ad8800c810277c4bb453b4c3b50a00abba20..7b96bac70aab5a714250adac5e43026a971755e1 100644 (file)
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -1,5 +1,3 @@
-%module misc
-%{
 /////////////////////////////////////////////////////////////////////////////
 // Name:        misc.i
 // Purpose:     Definitions of miscelaneous functions and classes
@@ -12,7 +10,9 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+%module misc
 
+%{
 #include "helpers.h"
 #include <wx/resource.h>
 %}
@@ -179,17 +179,22 @@ void wxEndBusyCursor();
 long wxExecute(const wxString& command, bool sync = FALSE);
 wxWindow * wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL);
 wxWindow * wxFindWindowByName(const wxString& name, wxWindow *parent=NULL);
+#ifdef __WXMSW__
 wxWindow * wxGetActiveWindow();
 long wxGetElapsedTime(bool resetTimer = TRUE);
 long wxGetFreeMemory();
+#endif
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();
+#ifdef __WXMSW__
 bool wxShell(const wxString& command = wxPyEmptyStr);
 void wxStartTimer();
+int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
+#endif
+
 bool wxYield();
 
-int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
 %inline %{
     char* wxGetResource(char *section, char *entry, char *file = NULL) {
         char * retval;
@@ -277,6 +282,7 @@ public:
 //---------------------------------------------------------------------------
 // Accelerator Entry and Table
 
+#ifdef __WXMSW__
 class wxAcceleratorEntry {
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0);
@@ -296,11 +302,26 @@ public:
     // ~wxAcceleratorEntry(); *** ?
 
 };
-
+#endif
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/08/18 19:48:19  RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
+// Revision 1.3  1998/08/16 04:31:10  RD
+// More wxGTK work.
+//
+// Revision 1.2  1998/08/15 07:36:41  RD
+// - Moved the header in the .i files out of the code that gets put into
+// the .cpp files.  It caused CVS conflicts because of the RCS ID being
+// different each time.
+//
+// - A few minor fixes.
+//
 // Revision 1.1  1998/08/09 08:25:51  RD
 // Initial version
 //