From e45689df6ca927c2105dd27cd57847a4fad45669 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Wed, 25 Jan 2006 00:18:12 +0000 Subject: [PATCH] Fixes for the GTK1 split git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/colour.h | 2 ++ include/wx/dcclient.h | 2 ++ include/wx/dcmemory.h | 2 ++ include/wx/dcscreen.h | 2 ++ include/wx/gdiobj.h | 2 ++ include/wx/minifram.h | 2 ++ include/wx/pen.h | 2 ++ src/gtk/gdiobj.cpp | 1 - src/gtk1/gdiobj.cpp | 1 - 9 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/wx/colour.h b/include/wx/colour.h index 7daa7cf935..b736ad8bbe 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -12,6 +12,8 @@ #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__) diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h index 3397bf6239..2cff3cf3f6 100644 --- a/include/wx/dcclient.h +++ b/include/wx/dcclient.h @@ -12,6 +12,8 @@ #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__) diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h index bddbd093ea..68e5a11d95 100644 --- a/include/wx/dcmemory.h +++ b/include/wx/dcmemory.h @@ -12,6 +12,8 @@ #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__) diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h index 581e359dbf..a9eade9f27 100644 --- a/include/wx/dcscreen.h +++ b/include/wx/dcscreen.h @@ -12,6 +12,8 @@ #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__) diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h index 89323a28b4..aac7facfe1 100644 --- a/include/wx/gdiobj.h +++ b/include/wx/gdiobj.h @@ -12,6 +12,8 @@ #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__) diff --git a/include/wx/minifram.h b/include/wx/minifram.h index 915781b2c2..8792576ef4 100644 --- a/include/wx/minifram.h +++ b/include/wx/minifram.h @@ -12,6 +12,8 @@ #ifndef _WX_MINIFRAM_H_BASE_ #define _WX_MINIFRAMH_BASE_ +#include "wx/defs.h" + #if defined(__WXPALMOS__) #include "wx/palmos/minifram.h" #elif defined(__WXMSW__) diff --git a/include/wx/pen.h b/include/wx/pen.h index 6101caf8cf..539d4f7531 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -12,6 +12,8 @@ #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__) diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp index 1bd836eef3..7627a2739f 100644 --- a/src/gtk/gdiobj.cpp +++ b/src/gtk/gdiobj.cpp @@ -7,7 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" #include "wx/gdiobj.h" IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/gtk1/gdiobj.cpp b/src/gtk1/gdiobj.cpp index 1bd836eef3..7627a2739f 100644 --- a/src/gtk1/gdiobj.cpp +++ b/src/gtk1/gdiobj.cpp @@ -7,7 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" #include "wx/gdiobj.h" IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -- 2.45.2