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

create wxTheClipboard on first use, not startup -- this fixes crash in console-only apps that were linked against wxGTK's 'core' shared library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-20 17:19:26 +00:00
parent fbe47c7b5c
commit 5dc43d1fc5
2 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/clipcmn.cpp
View File

@@ -33,49 +33,32 @@
#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:
bool OnInit();
void OnExit();
bool OnInit() { return true; }
void OnExit() { wxDELETE(gs_clipboard); }
private:
DECLARE_DYNAMIC_CLASS(wxClipboardModule)
};
// ----------------------------------------------------------------------------
// global data defined here
// ----------------------------------------------------------------------------
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