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

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

src/cocoa/icon.mm

@@ -10,9 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
-#ifndef WX_PRECOMP
+
 #include "wx/icon.h"
+
+#ifndef WX_PRECOMP
 #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;
 }
-

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"
 

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"

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)

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"

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"
 
 //-----------------------------------------------------------------------------

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"
 

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>

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"
 

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"

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"

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"
 

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)

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:

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"

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"
 

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"
 

src/mac/classic/icon.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/mac/classic/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,6 +9,8 @@
 // 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 ) :
@@ -62,7 +63,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     if ( handler )
         return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
     else
-        return FALSE;
+        return false;
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
@@ -119,8 +120,8 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
             M_BITMAPHANDLERDATA->m_ok = true ;
             M_BITMAPHANDLERDATA->m_numColors = 256 ;
             M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
-            return TRUE ;
+            return true;
         }
     }
-    return FALSE ;
+    return false;
 }

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"

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

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

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
 

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"

src/os2/icon.cpp

@@ -16,19 +16,18 @@
     #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)
 
 // ============================================================================

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
 

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

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

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"

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"

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"