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 3a10a3fefea66a52dce2871f43cce849f9b59cc0..46ef0dc8a29671abb9801e09d44a6083a5af18ce 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -1,46 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.cpp
+// Name:        src/msw/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#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"
-#include "assert.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
-#endif
+
+#define M_GDIDATA wx_static_cast(wxGDIRefData*, m_refData)
 
 /*
 void wxGDIObject::IncrementResourceUsage(void)
 {
-       if ( !M_GDIDATA )
-               return;
+    if ( !M_GDIDATA )
+        return;
 
 //  wxDebugMsg("Object %ld about to be incremented: %d\n", (long)this, m_usageCount);
   M_GDIDATA->m_usageCount ++;
@@ -48,12 +43,12 @@ void wxGDIObject::IncrementResourceUsage(void)
 
 void wxGDIObject::DecrementResourceUsage(void)
 {
-       if ( !M_GDIDATA )
-               return;
+    if ( !M_GDIDATA )
+        return;
 
   M_GDIDATA->m_usageCount --;
   if (wxTheApp)
-    wxTheApp->SetPendingCleanup(TRUE);
+    wxTheApp->SetPendingCleanup(true);
 //  wxDebugMsg("Object %ld decremented: %d\n", (long)this, M_GDIDATA->m_usageCount);
   if (M_GDIDATA->m_usageCount < 0)
   {
@@ -65,4 +60,3 @@ void wxGDIObject::DecrementResourceUsage(void)
 };
 
 */
-