Proofed that iostreams break threads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,7 +19,9 @@
|
||||
#include "wx/memory.h"
|
||||
#include "wx/font.h"
|
||||
#include "wx/settings.h"
|
||||
#ifdef wxUSE_WX_RESOURCES
|
||||
#include "wx/resource.h"
|
||||
#endif
|
||||
#include "wx/module.h"
|
||||
#include "wx/image.h"
|
||||
#include "wx/thread.h"
|
||||
@@ -320,8 +322,7 @@ void wxApp::CommonInit(void)
|
||||
#endif
|
||||
*/
|
||||
wxSystemSettings::Init();
|
||||
wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
|
||||
|
||||
|
||||
wxTheFontNameDirectory = new wxFontNameDirectory;
|
||||
wxTheFontNameDirectory->Initialize();
|
||||
|
||||
@@ -331,7 +332,11 @@ void wxApp::CommonInit(void)
|
||||
wxInitializeStockLists();
|
||||
wxInitializeStockObjects();
|
||||
|
||||
#ifdef wxUSE_WX_RESOURCES
|
||||
wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
|
||||
|
||||
wxInitializeResourceSystem();
|
||||
#endif
|
||||
|
||||
wxImage::InitStandardHandlers();
|
||||
|
||||
@@ -344,14 +349,16 @@ void wxApp::CommonCleanUp(void)
|
||||
wxDELETE(wxTheFontNameDirectory);
|
||||
wxDeleteStockObjects();
|
||||
|
||||
#ifdef wxUSE_WX_RESOURCES
|
||||
wxFlushResources();
|
||||
|
||||
wxDELETE(wxTheResourceCache);
|
||||
|
||||
wxCleanUpResourceSystem();
|
||||
#endif
|
||||
|
||||
wxDeleteStockLists();
|
||||
|
||||
wxCleanUpResourceSystem();
|
||||
|
||||
wxImage::CleanUpHandlers();
|
||||
|
||||
wxSystemSettings::Done();
|
||||
|
@@ -180,7 +180,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
|
||||
else
|
||||
{
|
||||
/* the user pressed on the menu item -> report */
|
||||
item->m_isChecked; /* make consistent again */
|
||||
item->m_isChecked = item->IsChecked(); /* make consistent again */
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -68,13 +68,21 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
|
||||
EVT_CHAR(wxTextCtrl::OnChar)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#ifndef NO_TEXT_WINDOW_STREAM
|
||||
wxTextCtrl::wxTextCtrl() : streambuf()
|
||||
{
|
||||
if (allocate()) setp(base(),ebuf());
|
||||
|
||||
m_modified = FALSE;
|
||||
}
|
||||
#else
|
||||
wxTextCtrl::wxTextCtrl()
|
||||
{
|
||||
m_modified = FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef NO_TEXT_WINDOW_STREAM
|
||||
wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
int style, const wxValidator& validator, const wxString &name ) : streambuf()
|
||||
@@ -84,6 +92,15 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
m_modified = FALSE;
|
||||
Create( parent, id, value, pos, size, style, validator, name );
|
||||
}
|
||||
#else
|
||||
wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
int style, const wxValidator& validator, const wxString &name )
|
||||
{
|
||||
m_modified = FALSE;
|
||||
Create( parent, id, value, pos, size, style, validator, name );
|
||||
}
|
||||
#endif
|
||||
|
||||
bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
@@ -621,6 +638,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
|
||||
key_event.Skip();
|
||||
}
|
||||
|
||||
#ifndef NO_TEXT_WINDOW_STREAM
|
||||
int wxTextCtrl::overflow( int WXUNUSED(c) )
|
||||
{
|
||||
int len = pptr() - pbase();
|
||||
@@ -697,6 +715,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
|
||||
WriteText(buf);
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
|
||||
GtkWidget* wxTextCtrl::GetConnectWidget()
|
||||
{
|
||||
|
Reference in New Issue
Block a user