some conflicts resolved

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 7cf023dc9f68d327f0916670f6ce1303a89132e9..357f388c085c0a65b1f7699982ae9625bb1d20e3 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -34,6 +34,10 @@
 
 #include "wx/thread.h"
 
 
 #include "wx/thread.h"
 

+// ===========================================================================
+// implementation
+// ===========================================================================
+

 // ---------------------------------------------------------------------------
 // wxAppBase
 // ----------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxAppBase
 // ----------------------------------------------------------------------------

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 94dbdd07efa63fa9fad928648059d7f36a0a9808..ee7a4018d2c8b2b152d105f6b775f74af1187233 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -41,7 +41,6 @@ wxClipboardBase::wxClipboardBase()
 // ----------------------------------------------------------------------------
 // wxClipboardModule: module responsible for initializing the global clipboard
 // object
 // ----------------------------------------------------------------------------
 // wxClipboardModule: module responsible for initializing the global clipboard
 // object

-//

 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule


@@ -58,5 +57,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
+// ----------------------------------------------------------------------------
+// global data defined here
+// ----------------------------------------------------------------------------

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)