Lookup result windows now force the first column size to be no great than 20 characte...

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index e1181ce03f4636a16885d3a0ee9aa1003c85bfd6..f253ccb9c1a1a6572cd49b5fdab4a691dad344e6 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
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -33,49 +33,32 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+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:
 // object
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:

-    bool OnInit();
-    void OnExit();
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 

-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
-

 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
 

-wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
-
-// ----------------------------------------------------------------------------
-// implementation
-// ----------------------------------------------------------------------------
-
-wxClipboardBase::wxClipboardBase()
-{
-}
-
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard;
-
-    return TRUE;
-}
-
-void wxClipboardModule::OnExit()
-{
-    delete wxTheClipboard;
-
-    wxTheClipboard = (wxClipboard *)NULL;
-}
-

 #endif // wxUSE_CLIPBOARD
 #endif // wxUSE_CLIPBOARD