use GetLabelText() instead of wxStripMenuCodes() to avoid stripping the part of the...

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

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index 77c3045ad85b9f466228097dbc8f112c3c9bc69b..46ef0dc8a29671abb9801e09d44a6083a5af18ce 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.cpp
+// Name:        src/msw/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
@@ -9,30 +9,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gdiobj.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/gdiobj.h"
+
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/gdiobj.h"
 #include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 
+#define M_GDIDATA wx_static_cast(wxGDIRefData*, m_refData)
+
 /*
 void wxGDIObject::IncrementResourceUsage(void)
 {
@@ -62,4 +60,3 @@ void wxGDIObject::DecrementResourceUsage(void)
 };
 
 */
-