wxMac requires UTF-8 for wxTextDataoObject

[wxWidgets.git] / include / wx / mgl / bitmap.h

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 9e8409a815b701ffa8e46d8fb06dc315211e6d5f..913c2ff75679f1d7451fa2f8840f3307dcff38ee 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -30,7 +30,7 @@ public:
     wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char* const* bits);
     wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char* const* bits);

-    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
+    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

     wxBitmap(const wxImage& image, int depth = -1);
     virtual ~wxBitmap() {}
 
     wxBitmap(const wxImage& image, int depth = -1);
     virtual ~wxBitmap() {}
 


@@ -47,8 +47,8 @@ public:
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 

-    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const;
-    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
+    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const;
+    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

 
     virtual wxPalette *GetPalette() const;
     virtual void SetPalette(const wxPalette& palette);
 
     virtual wxPalette *GetPalette() const;
     virtual void SetPalette(const wxPalette& palette);