Fixed a typo in wxDbConnectionsInUse()

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

diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h
index df475672ba243c5a826fb59cf52864485ffeb66e..90d99dbfed1f4e4bbc9d580c2b6f7b3a2189620b 100644 (file)
--- a/include/wx/mac/icon.h
+++ b/include/wx/mac/icon.h
@@ -27,9 +27,7 @@ public:
     ~wxIconRefData();
 
 public:
-/* TODO: whatever your actual icon handle is
   WXHICON m_hIcon;
-*/
 };
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
@@ -46,34 +44,34 @@ public:
   // Copy constructors
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
 
+  wxIcon( const char **bits, int width=-1, int height=-1 );
+  wxIcon( char **bits, int width=-1, int height=-1 );
   wxIcon(const char bits[], int width, int height);
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICON_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);
   ~wxIcon();
 
-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
+  bool LoadFile(const wxString& name, long flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
+      int desiredWidth /* = -1 */ , int desiredHeight = -1);
+  bool LoadFile(const wxString& name ,long flags = wxBITMAP_TYPE_ICON_RESOURCE )
+       { return LoadFile( name , flags , -1 , -1 ) ; } 
 
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 
-/* TODO: implementation
   void SetHICON(WXHICON ico);
   inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
-*/
 
-/* TODO */
   virtual bool Ok() const { return (m_refData != NULL) ; }
 };
 
-/* Example handlers. TODO: write your own handlers for relevant types.
-
-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
+/*
+class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+  DECLARE_DYNAMIC_CLASS(wxICONFileHandler)
 public:
-  inline wxICOFileHandler()
+  inline wxICONFileHandler()
   {
        m_name = "ICO icon file";
        m_extension = "ico";
@@ -83,16 +81,17 @@ public:
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth = -1, int desiredHeight = -1);
 };
+*/
 
-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
+class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+  DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
 public:
-  inline wxICOResourceHandler()
+  inline wxICONResourceHandler()
   {
-       m_name = "ICO resource";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO_RESOURCE;
+       m_name = "ICON resource";
+       m_extension = "";
+       m_type = wxBITMAP_TYPE_ICON_RESOURCE;
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
@@ -100,7 +99,5 @@ public:
 
 };
 
-*/
-
 #endif
     // _WX_ICON_H_