From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Oct 1999 13:40:07 +0000 (+0000)
Subject: some conflicts resolved
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d54598dd855e64cf2086b73cb3b8e3b99c513bbc?ds=sidebyside

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 7cf023dc9f..357f388c08 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -34,6 +34,10 @@
 
 #include "wx/thread.h"
 
+// ===========================================================================
+// implementation
+// ===========================================================================
+
 // ---------------------------------------------------------------------------
 // wxAppBase
 // ----------------------------------------------------------------------------
diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 94dbdd07ef..ee7a4018d2 100644
--- 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
-//
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
@@ -58,5 +57,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
+// ----------------------------------------------------------------------------
+// global data defined here
+// ----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)