Tries unsuccesfully to cure a few more problems

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

diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index f8d7ed4b85fc441e32aef78b993f2b4656e429f6..7b96bac70aab5a714250adac5e43026a971755e1 100644 (file)
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -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);
 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();
 wxWindow * wxGetActiveWindow();
 long wxGetElapsedTime(bool resetTimer = TRUE);
 long wxGetFreeMemory();

+#endif

 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();

+#ifdef __WXMSW__

 bool wxShell(const wxString& command = wxPyEmptyStr);
 void wxStartTimer();
 bool wxShell(const wxString& command = wxPyEmptyStr);
 void wxStartTimer();

+int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
+#endif
+

 bool wxYield();
 
 bool wxYield();
 

-int wxGetOsVersion(int *OUTPUT, int *OUTPUT);

 %inline %{
     char* wxGetResource(char *section, char *entry, char *file = NULL) {
         char * retval;
 %inline %{
     char* wxGetResource(char *section, char *entry, char *file = NULL) {
         char * retval;


@@ -277,6 +282,7 @@ public:
 //---------------------------------------------------------------------------
 // Accelerator Entry and Table
 
 //---------------------------------------------------------------------------
 // Accelerator Entry and Table
 

+#ifdef __WXMSW__

 class wxAcceleratorEntry {
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0);
 class wxAcceleratorEntry {
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0);


@@ -296,11 +302,19 @@ public:
     // ~wxAcceleratorEntry(); *** ?
 
 };
     // ~wxAcceleratorEntry(); *** ?
 
 };

-
+#endif

 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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
 // 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