don't set focus to a hidden notebook (patch 1299005)

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

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index 30919e2c120679af2d12808f0aeb3d08d5f41ec0..1e9cc0a3b4c23ecd144931971ae07157d8f22af3 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -6,13 +6,9 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,16 +29,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 

-wxGDIObject::wxGDIObject()
-{
-    m_visible = FALSE;
-}
-

 /*
 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 ++;


@@ -50,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)
   {