Include wx/icon.h according to precompiled headers of wx/wx.h (with other minor clean...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index 889f03e7cd2b579b8d45dee54a8cf6c807a2c910..d385c6d9c7741458c1d32bc927c5956d26132eed 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -6,13 +6,16 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/icon.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/icon.h"
 #endif //WX_PRECOMP
+
 #include "wx/bitmap.h"
 
 #include "wx/cocoa/autorelease.h"
@@ -44,7 +47,7 @@ protected:
 
 wxIconRefData::wxIconRefData()
 {
-    m_ok = FALSE;
+    m_ok = false;
     m_width = 0;
     m_height = 0;
     m_depth = 0;
@@ -116,7 +119,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     M_ICONDATA->m_numColors = 0;
     M_ICONDATA->m_quality = 0;
 
-    return FALSE;
+    return false;
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
@@ -157,4 +160,3 @@ WX_NSImage wxIcon::GetNSImage() const
         return nil;
     return M_ICONDATA->m_cocoaNSImage;
 }
-

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index d2aff268ff43ee0bdc4403582778b184ca0a6563..e36107a2ac4b42cd3f489545b58f7a16727dc0b0 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -27,9 +27,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif // WX_PRECOMP
 
-#include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/module.h"
 

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 158de63121ff05e39e801ea15f0f6a85438dacff..7e869fb82e11a6fec62e8e0e26d058e5b9f63c28 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,10 +31,10 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/bitmap.h"
-#include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/settings.h"

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 40ff56d9edcaa79ec17252395a2b97082745a87d..afdb96b826136783a03c2797e75ee99a8d16dfe1 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        iconbndl.cpp
+// Name:        src/common/iconbndl.cpp
 // Purpose:     wxIconBundle
 // Author:      Mattia Barbon
 // Created:     23.03.2002
@@ -15,6 +15,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/iconbndl.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/icon.h"
@@ -27,7 +29,6 @@
     #include "wx/image.h"
 #endif
 
-#include "wx/iconbndl.h"
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxIconArray)

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index b74aeec22aa6d8c8756b485929346f086201d90e..30d47e3ea4d271af86eda683e08d83739a3389a8 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -26,6 +26,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/button.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/module.h"
@@ -37,7 +38,6 @@
 #include "wx/cmndata.h"
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
-#include "wx/icon.h"
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 9a658bf2854a5759b18d0472f9060b42cf1e5f9d..2cc89ab085d97c43382166dc0ec02585af0b7fd1 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 32acc4f1376dec0ef1432ffc5c14d86d3e632b6d..b04bbe39059bd7dece6578feaea42c7ee68a8a4a 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -16,9 +16,9 @@
     #include "wx/app.h"
     #include "wx/dcmemory.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 02ad8b7b467dfe49d0ca6c9caddbc5a06eee6fcf..e262a9303ed7fdc09e6ce380343578dbeab4337e 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/math.h"
@@ -29,7 +30,6 @@
 #include "wx/gtk/private.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"
-#include "wx/icon.h"
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 9cf27b8065a8b24d02607cd2adceccda84c3f96c..7c2c675a795a5ea95922ba4f10fb0604a551ea86 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -16,9 +16,9 @@
     #include "wx/app.h"
     #include "wx/dcmemory.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif // WX_PRECOMP
 
-#include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8521da8756f0e796ccb6c47236a8c5a7bba1a7c3..ec64c3fb064ef802823ba20c273b35a59d0c67b6 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -25,11 +25,11 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cursor.h"
-#include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index c22d1b7821f5ddfa10d00eb2ebc903e954417085..8bc85846cc7187d838bb75b8a9ac51b903760ecb 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 4f3f0d47e558d0f02f3726dbc3fb81ef0861bdad..67d88107125a78679a2c018eec1427a1c2ddd682 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/icon.h"
 #endif // WX_PRECOMP
 
-#include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp
index 80eb0f7583177fd93e180e3def06a9e288e4f7a5..04c71a729aabc68bfd0a40fc7740b4039b0d92c9 100644 (file)
--- a/src/mac/carbon/imaglist.cpp
+++ b/src/mac/carbon/imaglist.cpp
@@ -19,9 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/image.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index bc0330d2f805b6a0190f7c6d77e875083438297b..c8bb4e1f2632c4aeaf59b439b97b73be3f719c93 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -19,13 +19,11 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/toplevel.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/mac/private.h"
 
-#include "wx/icon.h"
-
-
 class wxTaskBarIconImpl
 {
 public:

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index f9465f986565cba0c4745962bb2a98f00b37bf15..6d83aedb22043d4b5c674013ce22b635c60173db 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -29,11 +29,11 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cursor.h"
-#include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index d91980f7f8f1f7813933faf55e9f1687f5da2e15..54cc8bba0193f87f806c229c5116b2933ae16756 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -19,9 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

diff --git a/src/mac/classic/cursor.cpp b/src/mac/classic/cursor.cpp
index 14890766a5a0ac6a6051fc52d2e306d3e353f4be..8442483bc6911eacd4fb9279bfb72cece24a1684 100644 (file)
--- a/src/mac/classic/cursor.cpp
+++ b/src/mac/classic/cursor.cpp
@@ -19,9 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/icon.h"
 #endif // WX_PRECOMP
 
-#include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

diff --git a/src/mac/classic/icon.cpp b/src/mac/classic/icon.cpp
index aa4b3ab0b804dd4c2c6b3ba11bf74aef7b9c74b9..b62c94d043de355fdc8be696cfd1fc69e7a5446a 100644 (file)
--- a/src/mac/classic/icon.cpp
+++ b/src/mac/classic/icon.cpp
@@ -1,14 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/mac/classic/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/icon.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
@@ -24,10 +26,9 @@ wxIcon::wxIcon()
 {
 }
 
-wxIcon::wxIcon(const char bits[], int width, int height) :
-    wxBitmap(bits, width, height)
+wxIcon::wxIcon(const char bits[], int width, int height)
+       :wxBitmap(bits, width, height)
 {
-    
 }
 
 wxIcon::wxIcon( const char **bits ) :
@@ -54,15 +55,15 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight)
 {
     UnRef();
-    
+
     m_refData = new wxBitmapRefData;
-    
+
     wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
-    
+
     if ( handler )
         return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
     else
-        return FALSE;
+        return false;
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
@@ -98,7 +99,7 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
         Str255 theName ;
         OSType theType ;
         wxMacStringToPascal( name , theName ) ;
-        
+
         Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
         if ( resHandle != 0L )
         {
@@ -114,13 +115,13 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
             M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
             M_BITMAPHANDLERDATA->m_width =  32 ;
             M_BITMAPHANDLERDATA->m_height = 32 ;
-            
+
             M_BITMAPHANDLERDATA->m_depth = 8 ;
             M_BITMAPHANDLERDATA->m_ok = true ;
             M_BITMAPHANDLERDATA->m_numColors = 256 ;
             M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
-            return TRUE ;
+            return true;
         }
     }
-    return FALSE ;
+    return false;
 }

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 06e840311a500094f9a95cdf38e992aac7c19596..5eb34733e82acd77fa29d8626204bb526c21173e 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -20,9 +20,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dcmemory.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/image.h"

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index d2243a7edb954673725034a6ac23acbbefb03950..b72dbe20f38f694cfcaed6a327311e45066e8672 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -33,12 +33,12 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/menu.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/settings.h"
-#include "wx/icon.h"
 
 #ifdef __VMS__
     #pragma message disable nosimpint

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 1ddc29573e7db0a45ac79e3807a22eee02c7e73a..5314c53dae255b17461c842bba856c12679e1fc5 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -21,10 +21,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/settings.h"
-#include "wx/icon.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 6ba5c68d00ec3b3091f1aa28e14bfc6b985d602d..854e0edced3605f0bdacb42086371d30ae658fee 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -40,7 +40,6 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/wxchar.h"
-    #include "wx/icon.h"
     #include "wx/log.h"
 #endif
 

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 7cf9125bc27c42b1a44d2dc1339d76acf092cc97..fe9f2d83d0be40e03912979e2b0baed7a7047844 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -29,7 +29,6 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/wxchar.h"
-    #include "wx/icon.h"
     #include "wx/stdpaths.h"
     #include "wx/filename.h"
     #include "wx/log.h"

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index a8d7100033d17c2f49f36aa528498d85f5a41a42..7f2746b4a2a486a6d1a047387b79c5e66efdf769 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -16,20 +16,19 @@
     #pragma hdrstop
 #endif
 
+#include "wx/icon.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/icon.h"
-
-    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 
 // ============================================================================
 // implementation

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index 508e073e875a6b487675c3a7a55ccc34261bbb3f..3361595e65c97d1a63c400661818763afe07b305 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -40,7 +40,6 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/wxchar.h"
-    #include "wx/icon.h"
     #include "wx/log.h"
 #endif
 

diff --git a/src/palmos/icon.cpp b/src/palmos/icon.cpp
index 98af07bc4128d1687103c6fd615e8534c7c0c100..12a7d01948b884d52b5938bb13f9dd4071587720 100644 (file)
--- a/src/palmos/icon.cpp
+++ b/src/palmos/icon.cpp
@@ -24,11 +24,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/icon.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/icon.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
 #endif

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index cb2de8189758a1379413554f52f075441971d639..b81271298defa297c8993040b29dd15af4f330f9 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -19,11 +19,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/iconbndl.h"
 #include "wx/image.h"
-#include "wx/icon.h"
 
 #ifdef __VMS
 #pragma message disable nosimpint

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9bb85397335fbe2c3eefe7d1f155e59e4a23c54b..9554bbd7e203de5a3d256fd94314e44f3d086b5b 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -20,10 +20,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/memory.h"

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index b9905dde46314baae345944bf787cf599d26a02a..6139786ca5f3b1c8f43de6b42d8fd9286ecd81e5 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -18,9 +18,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/icon.h"
 #include "wx/image.h"
 
 #include "wx/x11/private.h"

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 7fbd54c0280129a461fb6e05b5652d0023e22dd4..3aff9bfa0e719ea6451f901795bcb8076bdeac77 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/icon.h"
 
 #include "wx/x11/private.h"