fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 94f075fc98459b7f744109428bf2cb090781186a..bbb7b68c6761df4e1051f8440e8db39fbf70d641 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:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "clipboardbase.h"
 #endif
 
     #pragma implementation "clipboardbase.h"
 #endif
 


@@ -31,13 +31,7 @@
 #include "wx/clipbrd.h"
 #include "wx/module.h"
 
 #include "wx/clipbrd.h"
 #include "wx/module.h"
 

-//--------------------------------------------------------------------------
-// wxClipboardBase
-//--------------------------------------------------------------------------
-
-wxClipboardBase::wxClipboardBase()
-{
-}
+#if wxUSE_CLIPBOARD

 
 // ----------------------------------------------------------------------------
 // wxClipboardModule: module responsible for initializing the global clipboard
 
 // ----------------------------------------------------------------------------
 // wxClipboardModule: module responsible for initializing the global clipboard


@@ -47,12 +41,8 @@ wxClipboardBase::wxClipboardBase()
 class wxClipboardModule : public wxModule
 {
 public:
 class wxClipboardModule : public wxModule
 {
 public:

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

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)


@@ -63,3 +53,29 @@ private:
 // ----------------------------------------------------------------------------
 
 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