X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26607f41ae9c6e8d805167e039ddf64eacee55a8..c6ebc32af0bd65527ab148d512dfdd67f3fcbd0a:/contrib/utils/wxrcedit/pe_adv.cpp diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp index 9c570d096b..4f74f4094f 100644 --- a/contrib/utils/wxrcedit/pe_adv.cpp +++ b/contrib/utils/wxrcedit/pe_adv.cpp @@ -18,7 +18,7 @@ #endif #include "wx/wx.h" -#include "wx/xml/xml.h" +#include "wx/xrc/xml.h" #include "wx/tokenzr.h" #include "wx/wx.h" #include "wx/dialog.h" @@ -113,7 +113,7 @@ void PropEditCtrlColor::OnDetails() wxString txt = m_TextCtrl->GetValue(); long unsigned tmp; - if (txt.Length() == 7 && txt[0] == _T('#') && + if (txt.Length() == 7 && txt[0u] == _T('#') && wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1) clr = wxColour((tmp & 0xFF0000) >> 16, (tmp & 0x00FF00) >> 8, @@ -165,6 +165,7 @@ void PropEditCtrlFlags::OnDetails() dlg.SetSizer(sz); dlg.SetAutoLayout(TRUE); + dlg.Layout(); for (i = 0; i < arr.GetCount(); i++) lbox->Append(arr[i]);