Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

[wxWidgets.git] / include / wx / iconloc.h

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index a1a5371a0de95b43f73c3194397a256c492684a6..bc1c359a45eebfc44f010f5b272ae655b4795fa6 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -18,7 +18,7 @@
 // wxIconLocation: describes the location of an icon
 // ----------------------------------------------------------------------------
 
 // wxIconLocation: describes the location of an icon
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxIconLocationBase
+class WXDLLIMPEXP_BASE wxIconLocationBase

 {
 public:
     // ctor takes the name of the file where the icon is
 {
 public:
     // ctor takes the name of the file where the icon is


@@ -43,7 +43,7 @@ private:
 // index of the icon
 #if defined(__WXMSW__)
 
 // index of the icon
 #if defined(__WXMSW__)
 

-class WXDLLEXPORT wxIconLocation : public wxIconLocationBase
+class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase

 {
 public:
     // ctor takes the name of the file where the icon is and the icons index in
 {
 public:
     // ctor takes the name of the file where the icon is and the icons index in


@@ -67,7 +67,13 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
 
 #else // !MSW
 
 
 #else // !MSW
 

-typedef wxIconLocationBase wxIconLocation;
+// must be a class because we forward declare it as class
+class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
+{
+public:
+    wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString)
+        : wxIconLocationBase(filename) { }
+};

 
 #endif // platform
 
 
 #endif // platform