*** empty log message ***

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index f7119fa44a951e2eb5d761823115c0c574a6e93a..e3316782288107e3678b8af493f6726730c0ba59 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -5,98 +5,108 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __ICONH__
-#define __ICONH__
+#ifndef _WX_ICON_H_
+#define _WX_ICON_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface "icon.h"
+    #pragma interface "icon.h"

 #endif
 
 #include "wx/bitmap.h"
 
 #endif
 
 #include "wx/bitmap.h"
 

+// ---------------------------------------------------------------------------
+// icon data
+// ---------------------------------------------------------------------------

 class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
 {
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
 {
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxIcon;

+

 public:
 public:

-    wxIconRefData(void);
-    ~wxIconRefData(void);
+    wxIconRefData();
+    ~wxIconRefData();

 
 public:
 
 public:

-  WXHICON m_hIcon;
+    WXHICON m_hIcon;

 };
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 #define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
 
 };
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 #define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
 

+// ---------------------------------------------------------------------------

 // Icon
 // Icon

-class WXDLLEXPORT wxIcon: public wxBitmap
+// ---------------------------------------------------------------------------
+class WXDLLEXPORT wxIcon : public wxBitmap

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxIcon)
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 
 public:
 
 public:

-  wxIcon(void);
+    wxIcon();

 
 

-  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { /* UnRef(); */ if (icon) Ref(*icon); }
+    // Copy constructors
+    wxIcon(const wxIcon& icon) { Ref(icon); }

 
 

-  wxIcon(const char bits[], const int width, const int height);
-  wxIcon(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-    int desiredWidth = -1, int desiredHeight = -1);
-  ~wxIcon(void);
+    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();

 
 

-  bool LoadFile(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
+    bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+                  int desiredWidth = -1, int desiredHeight = -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; }
+    wxIcon& operator = (const wxIcon& icon)
+        { if (*this == icon) return (*this); Ref(icon); return *this; }
+    bool operator == (const wxIcon& icon) const
+        { return m_refData == icon.m_refData; }
+    bool operator != (const wxIcon& icon) const
+        { return m_refData != icon.m_refData; }

 
 

-  void SetHICON(WXHICON ico);
-  inline WXHICON GetHICON(void) const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
+    void SetHICON(WXHICON ico);
+    WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }

 
 

-  virtual bool Ok(void) const { return (m_refData != NULL && M_ICONDATA->m_hIcon) ; }
+    bool Ok() const { return (m_refData != NULL && M_ICONDATA->m_hIcon != 0) ; }

 
 

-  bool FreeResource(bool force = FALSE);
+    bool FreeResource(bool force = FALSE);

 };
 
 // TODO: Put these in separate, private header
 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {
 };
 
 // TODO: Put these in separate, private header
 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+

 public:
 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, const long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    wxICOFileHandler()
+    {
+        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);

 };
 
 class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
 {
 };
 
 class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+

 public:
 public:

-  inline wxICOResourceHandler(void)
-  {
-       m_name = "ICO resource";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO_RESOURCE;
-  };
+    wxICOResourceHandler()
+    {
+        m_name = "ICO resource";
+        m_extension = "ico";
+        m_type = wxBITMAP_TYPE_ICO_RESOURCE;
+    };

 
 

-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+                          int desiredWidth = -1, int desiredHeight = -1);

 
 };
 
 #endif
 
 };
 
 #endif

-    // __ICONH__
+    // _WX_ICON_H_