new DC API fix

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

diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index bd112d3d98cec215172168b53ed1e917ffbe092d..cfcdd02a39038d57cc1765bba38dff53960cb806 100644 (file)
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -23,7 +23,7 @@
 class wxIcon : public wxGDIObject
 {
 public:
 class wxIcon : public wxGDIObject
 {
 public:

-    wxIcon(const wxString& name, long flags,
+    wxIcon(const wxString& name, wxBitmapType type,

            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 
            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 


@@ -51,7 +51,7 @@ public:
 
     
 #ifndef __WXMAC__
 
     
 #ifndef __WXMAC__

-    bool LoadFile(const wxString& name, long flags);
+    bool LoadFile(const wxString& name, wxBitmapType type);

 #endif
 
     // wxGDIImage methods
 #endif
 
     // wxGDIImage methods


@@ -93,7 +93,7 @@ public:
     ~wxIconLocation();
 
 
     ~wxIconLocation();
 
 

-    // returns true if this object is valid/initialized
+    // returns True if this object is valid/initialized

     bool IsOk() const;
     %pythoncode { def __nonzero__(self): return self.Ok() }
 
     bool IsOk() const;
     %pythoncode { def __nonzero__(self): return self.Ok() }