Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index de94cd9d544bf0f3926dbb395128f8c02ce66d5c..cc4398582d6e71792c9131fc373650f40fb8327f 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -1,43 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/gdiobj.h"
+

 #ifndef WX_PRECOMP
 #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
 
 #endif
 

-#include "wx/gdiobj.h"

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+#define M_GDIDATA static_cast<wxGDIRefData*>(m_refData)

 
 /*
 void wxGDIObject::IncrementResourceUsage(void)
 {
 
 /*
 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 ++;
 
 //  wxDebugMsg("Object %ld about to be incremented: %d\n", (long)this, m_usageCount);
   M_GDIDATA->m_usageCount ++;


@@ -45,12 +41,12 @@ void wxGDIObject::IncrementResourceUsage(void)
 
 void wxGDIObject::DecrementResourceUsage(void)
 {
 
 void wxGDIObject::DecrementResourceUsage(void)
 {

-       if ( !M_GDIDATA )
-               return;
+    if ( !M_GDIDATA )
+        return;

 
   M_GDIDATA->m_usageCount --;
   if (wxTheApp)
 
   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)
   {
 //  wxDebugMsg("Object %ld decremented: %d\n", (long)this, M_GDIDATA->m_usageCount);
   if (M_GDIDATA->m_usageCount < 0)
   {


@@ -62,4 +58,3 @@ void wxGDIObject::DecrementResourceUsage(void)
 };
 
 */
 };
 
 */

-