Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index f7119fa44a951e2eb5d761823115c0c574a6e93a..27d731129856997bf0da0855a90b901629b246c3 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -5,12 +5,12 @@
 // 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__
 #pragma interface "icon.h"
@@ -45,12 +45,12 @@ public:
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { /* UnRef(); */ if (icon) Ref(*icon); }
 
-  wxIcon(const char bits[], const int width, const int height);
-  wxIcon(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  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);
 
-  bool LoadFile(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  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; }
@@ -78,7 +78,7 @@ public:
        m_type = wxBITMAP_TYPE_ICO;
   };
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth = -1, int desiredHeight = -1);
 };
 
@@ -93,10 +93,10 @@ public:
        m_type = wxBITMAP_TYPE_ICO_RESOURCE;
   };
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth = -1, int desiredHeight = -1);
 
 };
 
 #endif
-    // __ICONH__
+    // _WX_ICON_H_