fix for potention crash when conversion fails

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index e382abbec1dc6168de9c1a928e4de2175549a389..bd4abefa09942aebc5b98c12e3b88acc08c4c1f1 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -11,12 +11,17 @@
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"

-#include "wx/palette.h"
-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+#endif // WX_PRECOMP
+

 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

-#include "wx/dcmemory.h"
-#include "wx/app.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>


@@ -24,8 +29,6 @@
 
 #include <gdk/gdkrgb.h>
 
 
 #include <gdk/gdkrgb.h>
 

-#include "wx/math.h"
-

 extern
 void gdk_wx_draw_bitmap (GdkDrawable  *drawable,
                          GdkGC        *gc,
 extern
 void gdk_wx_draw_bitmap (GdkDrawable  *drawable,
                          GdkGC        *gc,