reverted yet another accidental commit of testing code in r57505

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

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index a8d7100033d17c2f49f36aa528498d85f5a41a42..bfef80f19c186aba653a76886d669cd7d9e610b8 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -16,20 +16,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/icon.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/icon.h"

     #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
 #include "assert.h"
 
     #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
 #include "assert.h"
 

-#include "wx/icon.h"
-
-    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -62,7 +61,7 @@ wxIcon::wxIcon( const char WXUNUSED(bits)[],
 }
 
 wxIcon::wxIcon( const wxString& rIconFile,
 }
 
 wxIcon::wxIcon( const wxString& rIconFile,

-                long            lFlags,
+                wxBitmapType    lFlags,

                 int             nDesiredWidth,
                 int             nDesiredHeight )
        :m_bIsXpm(false)
                 int             nDesiredWidth,
                 int             nDesiredHeight )
        :m_bIsXpm(false)


@@ -86,9 +85,7 @@ wxIcon::~wxIcon()
 {
 }
 
 {
 }
 

-void wxIcon::CreateIconFromXpm(
-  const char**                      ppData
-)
+void wxIcon::CreateIconFromXpm(const char* const* ppData)

 {
     wxBitmap                        vBmp(ppData);
 
 {
     wxBitmap                        vBmp(ppData);
 


@@ -260,7 +257,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& rBmp )
 } // end of wxIcon::CopyFromBitmap
 
 bool wxIcon::LoadFile( const wxString& rFilename,
 } // end of wxIcon::CopyFromBitmap
 
 bool wxIcon::LoadFile( const wxString& rFilename,

-                       long lType,
+                       wxBitmapType lType,

                        int nDesiredWidth,
                        int nDesiredHeight )
 {
                        int nDesiredWidth,
                        int nDesiredHeight )
 {