Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some conflicts resolved

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-21 13:40:07 +00:00
parent 97c79de27c
commit d54598dd85
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/appcmn.cpp
View File

@@ -34,6 +34,10 @@
#include "wx/thread.h" #include "wx/thread.h"
// ===========================================================================
// implementation
// ===========================================================================
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxAppBase // wxAppBase
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

6
src/common/clipcmn.cpp
View File

@@ -41,7 +41,6 @@ wxClipboardBase::wxClipboardBase()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxClipboardModule: module responsible for initializing the global clipboard // wxClipboardModule: module responsible for initializing the global clipboard
// object // 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)