fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / os2 / icon.cpp

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index 6deee7dbdc2d7baea731c76061cf01cda56e13ed..26f744c91f4633cc6b6c12530076354529e68067 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -1,70 +1,114 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // Purpose:     wxIcon class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/09/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "icon.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/defs.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/icon.h"
 #endif
 
+#include "wx/os2/private.h"
+#include "assert.h"
+
 #include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
 
-/*
- * Icons
- */
+// ============================================================================
+// implementation
+// ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxIconRefData
+// ----------------------------------------------------------------------------
 
-wxIconRefData::wxIconRefData()
+void wxIconRefData::Free()
 {
-    // TODO: init icon handle
+    if (m_hIcon)
+        ::WinFreeFileIcon((HPOINTER)m_hIcon);
 }
 
-wxIconRefData::~wxIconRefData()
-{
-    // TODO: destroy icon handle
-}
+// ----------------------------------------------------------------------------
+// wxIcon
+// ----------------------------------------------------------------------------
 
 wxIcon::wxIcon()
 {
 }
 
-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(
+  const char                        WXUNUSED(bits)[]
+, int                               WXUNUSED(nWidth)
+, int                               WXUNUSED(nHeight)
+)
 {
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
-    int desiredWidth, int desiredHeight)
-
+wxIcon::wxIcon(
+  const wxString&                   rIconFile
+, long                              lFlags
+, int                               nDesiredWidth
+, int                               nDesiredHeight
+)
 {
-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    //
+    // A very poor hack, but we have to have separate icon files from windows
+    // So we have a modified name where replace the last three characters
+    // with os2.  Also need the extension.
+    //
+    wxString                         sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
+
+    sOs2Name += "Os2.ico";
+    LoadFile( sOs2Name
+             ,lFlags
+             ,nDesiredWidth
+             ,nDesiredHeight
+            );
 }
 
 wxIcon::~wxIcon()
 {
 }
 
-bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
+bool wxIcon::LoadFile(
+  const wxString&                   rFilename
+, long                              lType
+, int                               nDesiredWidth
+, int                               nDesiredHeight
+)
 {
-  UnRef();
-
-  m_refData = new wxIconRefData;
-
-  wxBitmapHandler *handler = FindHandler(type);
-
-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+    HPS                             hPs = NULLHANDLE;
+
+    UnRef();
+
+    wxGDIImageHandler*              pHandler = FindHandler(lType);
+
+    if (pHandler)
+        return(pHandler->Load( this
+                              ,rFilename
+                              ,hPs
+                              ,lType
+                              ,nDesiredWidth
+                              ,nDesiredHeight
+                             ));
+    else
+        return(FALSE);
 }