Include wx/gdiobj.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 44756a08465e33b49445a4d1eef2927c5e9cb45f..089ce8ccad9423cc579bb4025047698f501a9c97 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -37,6 +37,7 @@
 #include "wx/toplevel.h"
 #include "wx/frame.h"
 #include "wx/gdicmn.h"
 #include "wx/toplevel.h"
 #include "wx/frame.h"
 #include "wx/gdicmn.h"

+#include "wx/gdiobj.h"

 #include "wx/region.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"
 #include "wx/region.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"

diff --git a/src/cocoa/gdiobj.cpp b/src/cocoa/gdiobj.cpp
index f293a95db03886bdc93ad43830410206ec68de0a..4d0b2a9b60fac8f8fa1770bc9af06a975a3f62e7 100644 (file)
--- a/src/cocoa/gdiobj.cpp
+++ b/src/cocoa/gdiobj.cpp
@@ -1,14 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/cocoa/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Purpose:     wxGDIObject class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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

diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp
index 7627a2739f7bb4ea9c3bbfb1c97ee0e923ac1002..c01f42930fc01c050c4e50b3b3458108bb6a8a44 100644 (file)
--- a/src/gtk/gdiobj.cpp
+++ b/src/gtk/gdiobj.cpp
@@ -1,13 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/gtk/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.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 7627a2739f7bb4ea9c3bbfb1c97ee0e923ac1002..72ca341ea823b32a6b3ca085506a28ef5bc9ab48 100644 (file)
--- a/src/gtk1/gdiobj.cpp
+++ b/src/gtk1/gdiobj.cpp
@@ -1,13 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/gtk1/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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

-

diff --git a/src/mgl/gdiobj.cpp b/src/mgl/gdiobj.cpp
index e23c754e93a9b2a1c8ec7d31a209eaa5e0747518..97bf181d832fdb92b676345f483fced09764a3bc 100644 (file)
--- a/src/mgl/gdiobj.cpp
+++ b/src/mgl/gdiobj.cpp
@@ -16,13 +16,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/gdiobj.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
 #endif
 

-#include "wx/gdiobj.h"
-
-

 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index 447c88327bb8ad96c39c27648e743ef3c95d4e31..46ef0dc8a29671abb9801e09d44a6083a5af18ce 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -16,6 +16,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/gdiobj.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"


@@ -23,7 +25,6 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#include "wx/gdiobj.h"

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

diff --git a/src/x11/gdiobj.cpp b/src/x11/gdiobj.cpp
index 00289e33d8beec2adb1c7889926901c2140f9e02..b6dede210f043bd04aa1d286c6c9b3052ca5a802 100644 (file)
--- a/src/x11/gdiobj.cpp
+++ b/src/x11/gdiobj.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/x11/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/gdiobj.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/gdiobj.h"