No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

[wxWidgets.git] / include / wx / cocoa / icon.h

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index be697125ded043100472f78af160d481bea2c239..3d1f3f86153e133f1f18135a8e32090fe75d4ed7 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -18,25 +18,23 @@
 // ========================================================================
 // wxIcon
 // ========================================================================
 // ========================================================================
 // wxIcon
 // ========================================================================

-class WXDLLEXPORT wxIcon : public wxGDIObject
+class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject

 {
 public:
     wxIcon();
 
     wxIcon(const char* const* data) { CreateFromXpm(data); }
     wxIcon(const char bits[], int width , int height );
 {
 public:
     wxIcon();
 
     wxIcon(const char* const* data) { CreateFromXpm(data); }
     wxIcon(const char bits[], int width , int height );

-    wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
-        int desiredWidth = -1, int desiredHeight = -1);
+    wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE,
+           int desiredWidth = -1, int desiredHeight = -1);

     wxIcon(const wxIconLocation& loc)
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     virtual ~wxIcon();
 
     wxIcon(const wxIconLocation& loc)
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     virtual ~wxIcon();
 

-    bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
-        int desiredWidth /* = -1 */ , int desiredHeight = -1);
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )
-    {   return LoadFile( name , flags , -1 , -1 ) ; }
+    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
+                  int desiredWidth=-1, int desiredHeight=-1);

 
     bool operator==(const wxIcon& icon) const
     {   return m_refData == icon.m_refData; }
 
     bool operator==(const wxIcon& icon) const
     {   return m_refData == icon.m_refData; }


@@ -50,6 +48,8 @@ public:
     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

+    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
+

     WX_NSImage GetNSImage() const;
     bool CreateFromXpm(const char* const* bits);
 
     WX_NSImage GetNSImage() const;
     bool CreateFromXpm(const char* const* bits);