added test for wxScopeGuard

[wxWidgets.git] / src / common / bmpbase.cpp

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 9a901b4c60038787739760d33bb1acf55051f5a4..1b8688c5174828573d2e3266585a6190b7ad29d2 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -5,7 +5,7 @@
 // Created:     2001/04/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001, Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -19,8 +19,11 @@
     #pragma hdrstop
 #endif
 
-#if defined(__WXMGL__) || defined(__WXMAC__) \
-    || defined(__WXMOTIF__) || defined(__WXX11__)
+#if defined(__WXMGL__)   || \
+    defined(__WXMAC__)   || \
+    defined(__WXGTK__)   || \
+    defined(__WXMOTIF__) || \
+    defined(__WXX11__)
 
 #include "wx/setup.h"
 #include "wx/utils.h"
@@ -52,10 +55,10 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
     if ( handler )
     {
         sm_handlers.DeleteObject(handler);
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
@@ -116,11 +119,10 @@ class wxBitmapBaseModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
-    bool OnInit() { wxBitmap::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; };
     void OnExit() { wxBitmap::CleanUpHandlers(); };
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 
-#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__)
-
+#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__