Fix toolbar background painting whem comctl32 < 6

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 94f075fc98459b7f744109428bf2cb090781186a..6f380b5aaea65286eb49d1189a1668680da2e36c 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "clipboardbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,35 +27,34 @@
 #include "wx/clipbrd.h"
 #include "wx/module.h"
 
-//--------------------------------------------------------------------------
-// wxClipboardBase
-//--------------------------------------------------------------------------
+#if wxUSE_CLIPBOARD
 
-wxClipboardBase::wxClipboardBase()
+static wxClipboard *gs_clipboard = NULL;
+
+/*static*/ wxClipboard *wxClipboardBase::Get()
 {
+    if ( !gs_clipboard )
+    {
+        gs_clipboard = new wxClipboard;
+    }
+    return gs_clipboard;
 }
 
 // ----------------------------------------------------------------------------
-// wxClipboardModule: module responsible for initializing the global clipboard
+// wxClipboardModule: module responsible for destroying the global clipboard
 // object
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:
-    wxClipboardModule() { }
-
-    bool OnInit()
-        { wxTheClipboard = new wxClipboard; return TRUE; }
-    void OnExit()
-        { delete wxTheClipboard; wxTheClipboard = (wxClipboard *)NULL; }
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
-
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
+
+#endif // wxUSE_CLIPBOARD