Added missing | symbol

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

diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index 5d5efc3ba69253749304b944197ed4099f490413..88c48fe92de3ed26ea107c61d2bf50d880216194 100644 (file)
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -17,7 +17,7 @@
 #include "helpers.h"
 #include <wx/metafile.h>
 #ifndef __WXMSW__
-#include <wx/postscrp.h>
+#include <wx/dcps.h>
 #endif
 %}
 
@@ -147,19 +147,19 @@ public:
 
     wxString GetFaceName();
     int GetFamily();
+#ifdef __WXMSW__
     int GetFontId();
+#endif
     int GetPointSize();
     int GetStyle();
     bool GetUnderlined();
     int GetWeight();
-#ifdef __WXMSW__
     void SetFaceName(const wxString& faceName);
     void SetFamily(int family);
     void SetPointSize(int pointSize);
     void SetStyle(int style);
     void SetUnderlined(bool underlined);
     void SetWeight(int weight);
-#endif
 };
 
 //----------------------------------------------------------------------
@@ -210,24 +210,23 @@ public:
     int GetCap();
     wxColour& GetColour();
 
-#ifdef __WXMSW__
-            // **** This one needs to return a list of ints (wxDash)
-    int GetDashes(wxDash **dashes);
-    wxBitmap* GetStipple();
-#endif
     int GetJoin();
     int GetStyle();
     int GetWidth();
     bool Ok();
     void SetCap(int cap_style);
     void SetColour(wxColour& colour);
+    void SetJoin(int join_style);
+    void SetStyle(int style);
+    void SetWidth(int width);
+
 #ifdef __WXMSW__
+            // **** This one needs to return a list of ints (wxDash)
+    int GetDashes(wxDash **dashes);
+    wxBitmap* GetStipple();
     void SetDashes(int LCOUNT, wxDash* LIST);
     void SetStipple(wxBitmap& stipple);
 #endif
-    void SetJoin(int join_style);
-    void SetStyle(int style);
-    void SetWidth(int width);
 };
 
 //----------------------------------------------------------------------
@@ -405,10 +404,12 @@ public:
 
 //---------------------------------------------------------------------------
 
+#ifndef __WXMSW__
 class wxPostScriptDC : public wxDC {
 public:
       wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow* win = NULL);
 };
+#endif
 
 //---------------------------------------------------------------------------
 
@@ -503,7 +504,26 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.12  1999/01/30 07:30:11  RD
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// Revision 1.11  1998/12/18 15:49:05  RR
+//
+//   wxClipboard now serves the primary selection as well
+//   wxPython fixes
+//   warning mesages
+//
+// Revision 1.10  1998/12/17 18:05:50  RD
+//
+// wxPython 0.5.2
+// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
+// versions are much closer now!
+//
 // Revision 1.9  1998/12/17 14:07:37  RR
+//
 //   Removed minor differences between wxMSW and wxGTK
 //
 // Revision 1.8  1998/12/16 22:10:54  RD