Module definitions files for build VisualAge C++ V3.0 dlls.

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

diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index d0494d09a1b4f373db14535d577149ca4c79b6b9..cb566c385372882f283bcfce5f6511ca5a47f942 100644 (file)
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -365,12 +365,14 @@ public:
     // I'll do it this way to use long-lived objects and not have to
     // worry about when python may delete the object.
     %addmethods {
     // I'll do it this way to use long-lived objects and not have to
     // worry about when python may delete the object.
     %addmethods {

-        wxBrush(wxColour* colour, int style=wxSOLID) {
+        wxBrush(const wxColour* colour, int style=wxSOLID) {

             return wxTheBrushList->FindOrCreateBrush(*colour, style);
         }
         // NO Destructor.
     }
 
             return wxTheBrushList->FindOrCreateBrush(*colour, style);
         }
         // NO Destructor.
     }
 

+//      wxBrush(const wxColour& colour, int style=wxSOLID);
+

     wxColour& GetColour();
     wxBitmap * GetStipple();
     int GetStyle();
     wxColour& GetColour();
     wxBitmap * GetStipple();
     int GetStyle();


@@ -494,7 +496,6 @@ public:
     void GetLogicalOrigin(int *OUTPUT, int *OUTPUT);
     void SetLogicalOrigin(int x, int y);
     void GetDeviceOrigin(int *OUTPUT, int *OUTPUT);
     void GetLogicalOrigin(int *OUTPUT, int *OUTPUT);
     void SetLogicalOrigin(int x, int y);
     void GetDeviceOrigin(int *OUTPUT, int *OUTPUT);

-    void SetDeviceOrigin(int x, int y);

     void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
 };
     void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
 };


@@ -523,8 +524,8 @@ class wxScreenDC : public wxDC {
 public:
     wxScreenDC();
 
 public:
     wxScreenDC();
 

-    bool StartDrawingOnTop(wxWindow* window);
-    %name(StartDrawingOnTopRect) bool StartDrawingOnTop(wxRect* rect = NULL);
+    %name(StartDrawingOnTopWin) bool StartDrawingOnTop(wxWindow* window);
+    bool StartDrawingOnTop(wxRect* rect = NULL);

     bool EndDrawingOnTop();
 };
 
     bool EndDrawingOnTop();
 };
 


@@ -665,7 +666,7 @@ enum {
 
 class wxImageList {
 public:
 
 class wxImageList {
 public:

-    wxImageList(int width, int height, int mask=FALSE, int initialCount=1);
+    wxImageList(int width, int height, int mask=TRUE, int initialCount=1);

     ~wxImageList();
 
 #ifdef __WXMSW__
     ~wxImageList();
 
 #ifdef __WXMSW__