Moved some enums around to better match the C++ headers

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

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index b21b3dffffbdd807d12f86be5505c3cda4ef458c..e61213b4518d292109ee4bcd23c07637e5aca6a3 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -168,12 +168,13 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
-    // TODO:  Figure out what the start parameter means and devise a
-    // good typemap for this    
-    //void DrawPolyPolygon(int n, int start[], wxPoint points[],
-    //                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-    //                     int fillStyle = wxODDEVEN_RULE)
+    // TODO:  Figure out a good typemap for this...
+    //        Convert the first 3 args from a sequence of sequences?
+//     void DrawPolyPolygon(int n, int count[], wxPoint points[],
+//                           wxCoord xoffset = 0, wxCoord yoffset = 0,
+//                           int fillStyle = wxODDEVEN_RULE);
 
+    
     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and
@@ -572,12 +573,14 @@ public:
 
 %{
 //-=-=-=-=-=-=-=-=-=-=-    
-#if 0
+
+#if 1
+// Use the standard wxBufferedDC
 #include <wx/dcbuffer.h>
-#else
 
+#else
 
-//  Temporarily put a set of classes here similar to the old buffered DC
+//  Or, temporarily put a set of classes here similar to the old buffered DC
 //  classes until the real ones can be fixed to work "correctly" again.
 
 class wxBufferedDC : public wxMemoryDC
@@ -787,7 +790,7 @@ public:
 %newgroup
 
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
 
 %{
 #include <wx/metafile.h>
@@ -805,8 +808,10 @@ public:
     int GetWidth();
     int GetHeight();
 
+#ifdef __WXMSW__
     const wxString& GetFileName() const;
-
+#endif
+    
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };