Some minor tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/src/glcanvas.i

@@ -36,11 +36,11 @@
 
 
 %{
-//#ifdef SEPARATE
-//    static wxString wxPyEmptyStr("");
-//    static wxPoint  wxPyDefaultPosition(-1, -1);
-//    static wxSize   wxPyDefaultSize(-1, -1);
-//#endif
+#if defined(SEPARATE) && defined(__WXMSW__)
+    static wxString wxPyEmptyStr("");
+    static wxPoint  wxPyDefaultPosition(-1, -1);
+    static wxSize   wxPyDefaultSize(-1, -1);
+#endif
 %}
 
 %pragma(python) code = "import wx"
@@ -64,11 +64,13 @@ public:
     void SetColour(const char *colour);
     void SwapBuffers();
 
+#ifdef __WXGTK__
     void SetupPixelFormat();
     void SetupPalette(const wxPalette& palette);
     wxPalette CreateDefaultPalette();
-
     wxPalette* GetPalette();
+#endif
+
     wxWindow* GetWindow();
 };
 

utils/wxPython/src/msw/glcanvas.cpp

@@ -115,7 +115,7 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
-#ifdef SEPARATE
+#if defined(SEPARATE) && defined(__WXMSW__)
     static wxString wxPyEmptyStr("");
     static wxPoint  wxPyDefaultPosition(-1, -1);
     static wxSize   wxPyDefaultSize(-1, -1);

utils/wxPython/src/msw/wx.cpp

@@ -33,50 +33,8 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.13  1999/07/31 07:56:03  RD
- * wxPython 2.1b1:
- *
- * 	Added the missing wxWindow.GetUpdateRegion() method.
- *
- * 	Made a new change in SWIG (update your patches everybody) that
- * 	provides a fix for global shadow objects that get an exception in
- * 	their __del__ when their extension module has already been deleted.
- * 	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
- * 	line 496 if you want to do it by hand.
- *
- * 	It is now possible to run through MainLoop more than once in any one
- * 	process.  The cleanup that used to happen as MainLoop completed (and
- * 	prevented it from running again) has been delayed until the wxc module
- * 	is being unloaded by Python.
- *
- * 	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
- * 	wxWindow.PopupMenuXY to be consistent with some other methods.
- *
- * 	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
- *
- * 	You can now provide your own app.MainLoop method.  See
- * 	wxPython/demo/demoMainLoop.py for an example and some explaination.
- *
- * 	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
- * 	code to show how to use it.
- *
- * 	Put the wxIcon constructor back in for GTK as it now has one that
- * 	matches MSW's.
- *
- * 	Added wxGrid.GetCells
- *
- * 	Added wxSystemSettings static methods as functions with names like
- * 	wxSystemSettings_GetSystemColour.
- *
- * 	Removed wxPyMenu since using menu callbacks have been depreciated in
- * 	wxWindows.  Use wxMenu and events instead.
- *
- * 	Added alternate wxBitmap constructor (for MSW only) as
- * 	      wxBitmapFromData(data, type, width, height, depth = 1)
- *
- * 	Added a helper function named wxPyTypeCast that can convert shadow
- * 	objects of one type into shadow objects of another type.  (Like doing
- * 	a down-cast.)  See the implementation in wx.py for some docs.
+ * Revision 1.14  1999/08/05 05:06:38  RD
+ * Some minor tweaks
  *
  ************************************************************************/
 

utils/wxPython/src/msw/wx.py

@@ -1371,7 +1371,7 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 #----------------------------------------------------------------------
 # This helper function will take a wxPython object and convert it to
 # another wxPython object type.  This will not be able to create objects
-# user that are derived from wxPython classes, only those that are
+# that are derived from wxPython classes by the user, only those that are
 # actually part of wxPython and directly corespond to C++ objects.
 #
 # This is useful in situations where some method returns a generic
@@ -1458,8 +1458,8 @@ class wxApp(wxPyApp):
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:
-            #raise self.error, 'wxPyStdOutWindow not yet implemented.'
-            self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow()
+            raise self.error, 'wxPyStdOutWindow not yet implemented.'
+            #self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow()
 
     def RestoreStdio(self):
         sys.stdout, sys.stderr = self.saveStdio