mingw32 compilation fixes

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

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index 6deee7dbdc2d7baea731c76061cf01cda56e13ed..60614db09c32799db302b21132f5b68658c8726c 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -1,37 +1,55 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // Purpose:     wxIcon class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // 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

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

-#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 <stdio.h>
+#include "wx/setup.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/app.h"
+#include "wx/icon.h"

 #endif
 
 #endif
 

+#include "wx/os2/private.h"
+#include "assert.h"
+

 #include "wx/icon.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #include "wx/icon.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)

 #endif
 
 /*
  * Icons
  */
 
 #endif
 
 /*
  * Icons
  */
 

-

 wxIconRefData::wxIconRefData()
 {
 wxIconRefData::wxIconRefData()
 {

-    // TODO: init icon handle
+  m_hIcon = (WXHICON) NULL ;

 }
 
 wxIconRefData::~wxIconRefData()
 {
 }
 
 wxIconRefData::~wxIconRefData()
 {

-    // TODO: destroy icon handle
+  if ( m_hIcon )
+     return;
+  // TODO  ::DestroyIcon((HICON) m_hIcon);

 }
 
 wxIcon::wxIcon()
 }
 
 wxIcon::wxIcon()


@@ -63,8 +81,70 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler )
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler )

-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+    return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+  else
+    return FALSE;
+}
+
+void wxIcon::SetHICON(WXHICON ico)
+{
+  if ( !M_ICONDATA )
+  m_refData = new wxIconRefData;
+
+  M_ICONDATA->m_hIcon = ico;
+}
+
+bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+    int desiredWidth, int desiredHeight)
+{
+  return FALSE;
+}
+
+bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+    int desiredWidth, int desiredHeight)
+{
+// TODO
+/*
+  if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
+  {
+    if (desiredWidth > -1 && desiredHeight > -1)
+    {
+        M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);
+    }
+    else
+    {
+      M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadIcon(wxGetInstance(), name);
+    }
+
+    ICONINFO info ;
+    if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))
+    {
+        HBITMAP ms_bitmap = info.hbmMask ;
+        if (ms_bitmap)
+        {
+            BITMAP bm;
+            ::GetObject(ms_bitmap, sizeof(BITMAP), (LPSTR) &bm);
+            M_ICONHANDLERDATA->m_width = bm.bmWidth;
+            M_ICONHANDLERDATA->m_height = bm.bmHeight;
+        }
+        if (info.hbmMask)
+            ::DeleteObject(info.hbmMask) ;
+        if (info.hbmColor)
+            ::DeleteObject(info.hbmColor) ;
+      }
+    }
+    // Override the found values with desired values
+    if (desiredWidth > -1 && desiredHeight > -1)
+    {
+       M_ICONHANDLERDATA->m_width = desiredWidth;
+       M_ICONHANDLERDATA->m_height = desiredHeight;
+    }
+
+    M_ICONHANDLERDATA->m_ok = (M_ICONHANDLERDATA->m_hIcon != 0);
+    return M_ICONHANDLERDATA->m_ok;
+  }

   else
   else

-       return FALSE;
+*/
+    return FALSE;

 }
 
 }