Fixes for the GTK1 split

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 7daa7cf93576f807cc1fdb82ef2e955c2653f3d5..b736ad8bbed48bc6a3e445ef80af6d6fbeb41b52 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -12,6 +12,8 @@
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/colour.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/colour.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 3397bf623931d72e9cc243aed5d13b00375c9f86..2cff3cf3f6f10972202349c130a8eeaab5e2730e 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -12,6 +12,8 @@
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcclient.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcclient.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index bddbd093eaad78c15865baf33b5e9f7be19431e2..68e5a11d95b9903d79135915bb6c2c5a129876bc 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -12,6 +12,8 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 581e359dbf67ef1a708879ca135352a34d3aae2e..a9eade9f27c981c9836650f6cf23e6c23dde4819 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -12,6 +12,8 @@
 #ifndef _WX_DCSCREEN_H_BASE_
 #define _WX_DCSCREEN_H_BASE_
 
 #ifndef _WX_DCSCREEN_H_BASE_
 #define _WX_DCSCREEN_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcscreen.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcscreen.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 89323a28b4800a48fdd834e48b92913f9047f37a..aac7facfe1f2a9c25c3f367b501901be0f65d594 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -12,6 +12,8 @@
 #ifndef _WX_GDIOBJ_H_BASE_
 #define _WX_GDIOBJ_H_BASE_
 
 #ifndef _WX_GDIOBJ_H_BASE_
 #define _WX_GDIOBJ_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/gdiobj.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/gdiobj.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 915781b2c2d71aff754f1f33147e75c264eb2f6c..8792576ef4ea3faa5613b3a0e489458048a1d87d 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -12,6 +12,8 @@
 #ifndef _WX_MINIFRAM_H_BASE_
 #define _WX_MINIFRAMH_BASE_
 
 #ifndef _WX_MINIFRAM_H_BASE_
 #define _WX_MINIFRAMH_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/minifram.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/minifram.h"
 #elif defined(__WXMSW__)

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 6101caf8cf3dfdbcb137fdc6c484856ca194c6d9..539d4f7531d47e24cbb03bc45a0df5ea16fb159f 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -12,6 +12,8 @@
 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 
 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/pen.h"
 #elif defined(__WXMSW__)
 #if defined(__WXPALMOS__)
 #include "wx/palmos/pen.h"
 #elif defined(__WXMSW__)

diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp
index 1bd836eef3520a39291dae4555092f9c048c03b1..7627a2739f7bb4ea9c3bbfb1c97ee0e923ac1002 100644 (file)
--- a/src/gtk/gdiobj.cpp
+++ b/src/gtk/gdiobj.cpp
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"

 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

diff --git a/src/gtk1/gdiobj.cpp b/src/gtk1/gdiobj.cpp
index 1bd836eef3520a39291dae4555092f9c048c03b1..7627a2739f7bb4ea9c3bbfb1c97ee0e923ac1002 100644 (file)
--- a/src/gtk1/gdiobj.cpp
+++ b/src/gtk1/gdiobj.cpp
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"

 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)