*** empty log message ***

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 038d778613b9dc45058510a364c14e1051832afd..07a1f4fb5596233f3cdd8757ab537fa345697691 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.h
 // Purpose:     wxIcon class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.h
 // Purpose:     wxIcon class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/09/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// 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
-

 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxIconRefData: public wxBitmapRefData


@@ -27,9 +23,7 @@ public:
     ~wxIconRefData();
 
 public:
     ~wxIconRefData();
 
 public:

-/* TODO: whatever your actual icon handle is
-  WXHICON m_hIcon;
-*/
+    WXHICON m_hIcon;

 };
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 };
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)


@@ -49,8 +43,6 @@ public:
   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(const char bits[], int width, int height);
   wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);

-  wxIcon( char **bits, int width=-1, int height=-1 );
-

   ~wxIcon();
 
   bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
   ~wxIcon();
 
   bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,


@@ -60,20 +52,19 @@ public:
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 
   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); }
   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) ; }
 private:
   virtual bool Ok() const { return (m_refData != NULL) ; }
 private:

-  // supress VisAge hiding warning
-  bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE)
-  { return(wxBitmap::LoadFile(name, type)); }
+  // supress virtual function hiding warning
+  virtual bool LoadFile( const wxString& name
+                        ,long type = wxBITMAP_TYPE_BMP_RESOURCE
+                       )
+   { return(wxBitmap::LoadFile(name, type)); };

 };
 
 };
 

-/* Example handlers. TODO: write your own handlers for relevant types.
+// Example handlers. TODO: write your own handlers for relevant types.

 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {
 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {


@@ -81,9 +72,9 @@ class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 public:
   inline wxICOFileHandler()
   {
 public:
   inline wxICOFileHandler()
   {

-       m_name = "ICO icon file";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO;
+    m_name = "ICO icon file";
+    m_extension = "ico";
+    m_type = wxBITMAP_TYPE_ICO;

   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,


@@ -96,9 +87,9 @@ class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
 public:
   inline wxICOResourceHandler()
   {
 public:
   inline wxICOResourceHandler()
   {

-       m_name = "ICO resource";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO_RESOURCE;
+    m_name = "ICO resource";
+    m_extension = "ico";
+    m_type = wxBITMAP_TYPE_ICO_RESOURCE;

   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,


@@ -106,7 +97,6 @@ public:
 
 };
 
 
 };
 

-*/
-

 #endif
     // _WX_ICON_H_
 #endif
     // _WX_ICON_H_

+