When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 78fd6c42be9b24712508a85d5a56a2fe2154d19b..21f8abd6b4af6e3123ed92d4448ec12f600b83a2 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -1,100 +1,94 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        icon.h
+// Name:        wx/msw/icon.h

 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#ifdef __GNUG__
-#pragma interface "icon.h"
-#endif
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/msw/gdiimage.h"

 
 

-#include "wx/bitmap.h"
+// ---------------------------------------------------------------------------
+// icon data
+// ---------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
+// notice that although wxIconRefData inherits from wxBitmapRefData, it is not
+// a valid wxBitmapRefData
+class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData

 {
 {

-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;

 public:
 public:

-    wxIconRefData(void);
-    ~wxIconRefData(void);
+    wxIconRefData() { }
+    virtual ~wxIconRefData() { Free(); }

 
 

-public:
-  WXHICON m_hIcon;
+    virtual void Free();

 };
 
 };
 

-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
-
+// ---------------------------------------------------------------------------

 // Icon
 // Icon

-class WXDLLEXPORT wxIcon: public wxBitmap
-{
-  DECLARE_DYNAMIC_CLASS(wxIcon)
+// ---------------------------------------------------------------------------

 
 

+class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage
+{

 public:
 public:

-  wxIcon(void);
+    // ctors
+        // default
+    wxIcon() { }

 
 

-  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+        // from raw data
+    wxIcon(const char bits[], int width, int height);

 
 

-  wxIcon(const char bits[], int width, int height);
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-    int desiredWidth = -1, int desiredHeight = -1);
-  ~wxIcon(void);
+        // from XPM data
+    wxIcon(const char* const* data) { CreateIconFromXpm(data); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char **data) { CreateIconFromXpm(const_cast<const char* const*>(data)); }
+#endif
+        // from resource/file
+    wxIcon(const wxString& name,
+           wxBitmapType type = wxICON_DEFAULT_TYPE,
+           int desiredWidth = -1, int desiredHeight = -1);

 
 

-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
+    wxIcon(const wxIconLocation& loc);

 
 

-  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; }
+    virtual ~wxIcon();

 
 

-  void SetHICON(WXHICON ico);
-  inline WXHICON GetHICON(void) const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType type = wxICON_DEFAULT_TYPE,
+                          int desiredWidth = -1, int desiredHeight = -1);

 
 

-  virtual bool Ok(void) const { return (m_refData != NULL && M_ICONDATA->m_hIcon) ; }
+    // implementation only from now on
+    wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }

 
 

-  bool FreeResource(bool force = FALSE);
-};
+    void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
+    WXHICON GetHICON() const { return (WXHICON)GetHandle(); }

 
 

-// TODO: Put these in separate, private header
+    // create from bitmap (which should have a mask unless it's monochrome):
+    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
+    // ctors, assignment operators...), but it's ok to have such function
+    void CopyFromBitmap(const wxBitmap& bmp);

 
 

-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
-public:
-  inline wxICOFileHandler(void)
-  {
-       m_name = "ICO icon file";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
-};
+protected:
+    virtual wxGDIImageRefData *CreateData() const
+    {
+        return new wxIconRefData;
+    }

 
 

-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
-public:
-  inline wxICOResourceHandler(void)
-  {
-       m_name = "ICO resource";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO_RESOURCE;
-  };
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
 

-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    // create from XPM data
+    void CreateIconFromXpm(const char* const* data);

 
 

+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 #endif
 };
 
 #endif