Bring upstream version tagged ACARC_2006_07_16 through from vendor branch.

[wxWidgets.git] / src / os2 / gdiobj.cpp

diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp
index 5adc704f5e21ade94142c48cd9c2a5aec57c0c52..85d8e902fb73fed3b776d5763ab74b61454a9e93 100644 (file)
--- a/src/os2/gdiobj.cpp
+++ b/src/os2/gdiobj.cpp
@@ -1,20 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.cpp
+// Name:        src/os2/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+#endif
 
 class wxStockGDIPM: public wxStockGDI
 {