Applied patch to reorder includes. Not the most

   important patch in the world, but still.

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 10b8e7063d5d2f783f4239fbf0b1c60e9118f2d2..4950f9508ac3b89b2732a8c8c30892856e02c470 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -16,8 +16,8 @@
 
 #include "wx/defs.h"
 
-#include "wx/palette.h"
 #include "wx/bitmap.h"
+#include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index ebb55bb7b01f4fbea09cc3cd74f146773699d6f9..60735789ebf5aa0454b50134af65711de57b3a2a 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -15,8 +15,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
+#include "wx/gdicmn.h"
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 74d4132b432737bc1b6be2efa7d14010488fbca2..d89a31d44ff7d807a8086f83fd74090674e83ea9 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -28,11 +28,8 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-#include "wx/app.h"
 #include "wx/evtloop.h"
+#include "wx/app.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index fe2fe16ec3c173d4a55d9e048c029b715942e039..76811ec307fc495379cb15881ad777664927b9cc 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -20,8 +20,8 @@
 
 #ifndef __WXGPE__
 
-#include "wx/fontutil.h"
 #include "wx/fontdlg.h"
+#include "wx/fontutil.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index f1f4317e11df3417b03d1f7d9c6e88efcd1ed692..c6043a88c68689b771b844149e4137c695d11755 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/defs.h"
 
+#include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 9f0903dc80f0a5030be65acfbbeeccd0330836c5..3c9c2622e085951b19cc67b1cec7bf1ed3e2f7e9 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -442,14 +442,34 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
+    DoDrawBitmap( icon, x, y, true );
 }
 
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
+    if (!bitmap.Ok()) return;
+    
+#if 0
+    // TODO do something clever here
+    if (bitmap.HasPixbuf())
+    {
+    }
+    else
+#endif
+    {
+        wxImage image = bitmap.ConvertToImage();
+
+        if (!image.Ok()) return;
+
+       gnome_print_moveto (m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+    }
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
+    return;
+
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index d957352dbfc4e5c5e0c15e6e99977fb2bbe93c30..82956da0a6f9d497f1d18f8a0cee4a1ca96d4cb3 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -15,11 +15,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/menu.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/bitmap.h"
-#include "wx/menu.h"
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index eaa3d7cf3ab59fc6f1a810bef999b0da26f5d284..4ee201a9f2a498295bcc12150d554d09392c0878 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -22,10 +22,10 @@
 
 #if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
 
+#include "wx/msgdlg.h"
 #include "wx/gtk/private.h"
 #include <gtk/gtk.h>
 
-#include "wx/msgdlg.h"
 #include "wx/intl.h"
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 20746fb14bde77d0282562de69f631629d707215..5807eabbeec9a3062d06f9e800c7521540f16c52 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -23,10 +23,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/log.h"
-
 #include "wx/region.h"
-
+#include "wx/log.h"
 #include "wx/gtk/private.h"
 
 #ifndef __WXGTK20__

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index aa02feb1935a5fa4b989927b7e4e98d9d8838efe..c6d47c1f4a751d5dcecee0e54c33e2f1ba72def6 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -24,15 +24,12 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
+#include "wx/renderer.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"
-#include "wx/renderer.h"
 
 #ifdef __WXGTK20__
     #include "wx/settings.h"

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 4d82bb3209d4ed1b486b1732e71eca2713f252a4..fd31b4e024c25b015742fc1c5eff5604422661b3 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -28,10 +28,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/scrolwin.h"
 #include "wx/utils.h"
 #include "wx/dcclient.h"
-
-#include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/sizer.h"
 

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 85dd72c3e2a4df24e1f11c2a5189ca3da762dd73..be0e53af49b5699de6dda17a9ed7452e297b2de8 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -16,6 +16,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/gtk/taskbarpriv.h"
 #include "wx/log.h"
 #include "wx/frame.h"
 
@@ -25,7 +26,6 @@
 #include <gtk/gtkversion.h>
 #if GTK_CHECK_VERSION(2, 1, 0)
 
-#include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()

diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index 8907b7d39d881aa6366ed7c3ba219af108a4c15d..c31f6c8454a05d8c754d93a3b28903f292aa55c2 100644 (file)
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -16,9 +16,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/thread.h"
 #include "wx/wx.h"
 #include "wx/module.h"
-#include "wx/thread.h"
 #include "wx/log.h"
 
 wxMutex::wxMutex()

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index cc65251bb022e2169eb626927123408db67d46e2..b869e4ed4c4de378ab8836680a94c8c259142802 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -15,13 +15,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/thread.h"
 #include <stdio.h>
 #include <unistd.h>
 
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
-#include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/log.h"

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 3a679894d21851f56402ea57d60ee4be28fd8ff6..5f428af202fbe6bbe8f8147804e7644f85dd0467 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -18,8 +18,8 @@
 
 #if wxUSE_TOOLTIPS
 
-#include "wx/window.h"
 #include "wx/tooltip.h"
+#include "wx/window.h"
 
 #include "wx/gtk/private.h"
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index a622a7e248ddb5c153a9a510dfb52595d27650d0..1de5cf38e14531c3cebefd928d448995473b1fb7 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/defs.h"
 
+#include "wx/toplevel.h"
 #include "wx/log.h"
 #include "wx/dialog.h"
 #include "wx/control.h"

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 10b8e7063d5d2f783f4239fbf0b1c60e9118f2d2..4950f9508ac3b89b2732a8c8c30892856e02c470 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -16,8 +16,8 @@
 
 #include "wx/defs.h"
 
-#include "wx/palette.h"
 #include "wx/bitmap.h"
+#include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index ebb55bb7b01f4fbea09cc3cd74f146773699d6f9..60735789ebf5aa0454b50134af65711de57b3a2a 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -15,8 +15,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
+#include "wx/gdicmn.h"
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp
index 74d4132b432737bc1b6be2efa7d14010488fbca2..d89a31d44ff7d807a8086f83fd74090674e83ea9 100644 (file)
--- a/src/gtk1/evtloop.cpp
+++ b/src/gtk1/evtloop.cpp
@@ -28,11 +28,8 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-#include "wx/app.h"
 #include "wx/evtloop.h"
+#include "wx/app.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index fe2fe16ec3c173d4a55d9e048c029b715942e039..76811ec307fc495379cb15881ad777664927b9cc 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -20,8 +20,8 @@
 
 #ifndef __WXGPE__
 
-#include "wx/fontutil.h"
 #include "wx/fontdlg.h"
+#include "wx/fontutil.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index f1f4317e11df3417b03d1f7d9c6e88efcd1ed692..c6043a88c68689b771b844149e4137c695d11755 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/defs.h"
 
+#include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index 9f0903dc80f0a5030be65acfbbeeccd0330836c5..3c9c2622e085951b19cc67b1cec7bf1ed3e2f7e9 100644 (file)
--- a/src/gtk1/gnome/gprint.cpp
+++ b/src/gtk1/gnome/gprint.cpp
@@ -442,14 +442,34 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
+    DoDrawBitmap( icon, x, y, true );
 }
 
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
+    if (!bitmap.Ok()) return;
+    
+#if 0
+    // TODO do something clever here
+    if (bitmap.HasPixbuf())
+    {
+    }
+    else
+#endif
+    {
+        wxImage image = bitmap.ConvertToImage();
+
+        if (!image.Ok()) return;
+
+       gnome_print_moveto (m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+    }
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
+    return;
+
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index d957352dbfc4e5c5e0c15e6e99977fb2bbe93c30..82956da0a6f9d497f1d18f8a0cee4a1ca96d4cb3 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -15,11 +15,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/menu.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/bitmap.h"
-#include "wx/menu.h"
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index eaa3d7cf3ab59fc6f1a810bef999b0da26f5d284..4ee201a9f2a498295bcc12150d554d09392c0878 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -22,10 +22,10 @@
 
 #if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
 
+#include "wx/msgdlg.h"
 #include "wx/gtk/private.h"
 #include <gtk/gtk.h>
 
-#include "wx/msgdlg.h"
 #include "wx/intl.h"
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 20746fb14bde77d0282562de69f631629d707215..5807eabbeec9a3062d06f9e800c7521540f16c52 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -23,10 +23,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/log.h"
-
 #include "wx/region.h"
-
+#include "wx/log.h"
 #include "wx/gtk/private.h"
 
 #ifndef __WXGTK20__

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index aa02feb1935a5fa4b989927b7e4e98d9d8838efe..c6d47c1f4a751d5dcecee0e54c33e2f1ba72def6 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -24,15 +24,12 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
+#include "wx/renderer.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"
-#include "wx/renderer.h"
 
 #ifdef __WXGTK20__
     #include "wx/settings.h"

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 4d82bb3209d4ed1b486b1732e71eca2713f252a4..fd31b4e024c25b015742fc1c5eff5604422661b3 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -28,10 +28,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/scrolwin.h"
 #include "wx/utils.h"
 #include "wx/dcclient.h"
-
-#include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/sizer.h"
 

diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp
index 85dd72c3e2a4df24e1f11c2a5189ca3da762dd73..be0e53af49b5699de6dda17a9ed7452e297b2de8 100644 (file)
--- a/src/gtk1/taskbar.cpp
+++ b/src/gtk1/taskbar.cpp
@@ -16,6 +16,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/gtk/taskbarpriv.h"
 #include "wx/log.h"
 #include "wx/frame.h"
 
@@ -25,7 +26,6 @@
 #include <gtk/gtkversion.h>
 #if GTK_CHECK_VERSION(2, 1, 0)
 
-#include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 8907b7d39d881aa6366ed7c3ba219af108a4c15d..c31f6c8454a05d8c754d93a3b28903f292aa55c2 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -16,9 +16,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/thread.h"
 #include "wx/wx.h"
 #include "wx/module.h"
-#include "wx/thread.h"
 #include "wx/log.h"
 
 wxMutex::wxMutex()

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index cc65251bb022e2169eb626927123408db67d46e2..b869e4ed4c4de378ab8836680a94c8c259142802 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -15,13 +15,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/thread.h"
 #include <stdio.h>
 #include <unistd.h>
 
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
-#include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/log.h"

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 3a679894d21851f56402ea57d60ee4be28fd8ff6..5f428af202fbe6bbe8f8147804e7644f85dd0467 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -18,8 +18,8 @@
 
 #if wxUSE_TOOLTIPS
 
-#include "wx/window.h"
 #include "wx/tooltip.h"
+#include "wx/window.h"
 
 #include "wx/gtk/private.h"
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index a622a7e248ddb5c153a9a510dfb52595d27650d0..1de5cf38e14531c3cebefd928d448995473b1fb7 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/defs.h"
 
+#include "wx/toplevel.h"
 #include "wx/log.h"
 #include "wx/dialog.h"
 #include "wx/control.h"