diff --git a/checkin_notes b/checkin_notes index dd260e7a0b..ace27fd5b2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7892,3 +7892,15 @@ David 08 Nov 2010 html/inc/ prefs_util.inc + +Rom 08 Nov 2010 + - MGR: Fix the event log so that it doesn't store the event log's + size information when it is in a minimized state. + - MGR: Fix the close dialog issue on wxGTK, apparently there is a + hidden flag that governs the handling of the GTK callback + function. Fixes #962 (Thanks for the patch cli) + + clientgui/ + DlgAdvPreferencesBase.cpp + DlgEventLog.cpp + DlgItemProperties.cpp diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp index 8b43f3a577..6cb1d142f9 100644 --- a/clientgui/DlgAdvPreferencesBase.cpp +++ b/clientgui/DlgAdvPreferencesBase.cpp @@ -45,7 +45,7 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri strCaption.Printf(_("%s - Preferences"), pSkinAdvanced->GetApplicationName().c_str()); } - this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + this->SetExtraStyle( this->GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); this->Centre( wxBOTH ); this->SetTitle(strCaption); diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp index 51cc30b364..bc7953ddb1 100644 --- a/clientgui/DlgEventLog.cpp +++ b/clientgui/DlgEventLog.cpp @@ -671,12 +671,13 @@ void CDlgEventLog::SetWindowDimensions() { wxASSERT(pConfig); - pConfig->SetPath(strBaseConfigLocation); - - pConfig->Write(wxT("XPos"), GetPosition().x); - pConfig->Write(wxT("YPos"), GetPosition().y); - pConfig->Write(wxT("Width"), GetSize().x); - pConfig->Write(wxT("Height"), GetSize().y); + if (!IsIconized()) { + pConfig->SetPath(strBaseConfigLocation); + pConfig->Write(wxT("XPos"), GetPosition().x); + pConfig->Write(wxT("YPos"), GetPosition().y); + pConfig->Write(wxT("Width"), GetSize().x); + pConfig->Write(wxT("Height"), GetSize().y); + } } diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp index 69120d8e73..1af4409eb4 100755 --- a/clientgui/DlgItemProperties.cpp +++ b/clientgui/DlgItemProperties.cpp @@ -42,7 +42,7 @@ CDlgItemProperties::CDlgItemProperties(wxWindow* parent) : if (!pFrame) return; SetSizeHints( wxDefaultSize, wxDefaultSize ); - SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); m_bSizer1 = new wxBoxSizer( wxVERTICAL );