Changes to the XRC library:
1. preparation of XRC handlers for subclassing (Alex) 2. fixed incorrect use of _() in couple of places 3. wxFrame and wxDialog positioning fixes 4. menus and toolbars attach themselves to the parent frame 5. style unification: let all _T()s be wxT()s git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,17 +59,19 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
|
||||
|
||||
frame->Create(m_parentAsWindow,
|
||||
GetID(),
|
||||
GetText(_T("title")),
|
||||
GetText(wxT("title")),
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
GetStyle(_T("style"), wxDEFAULT_FRAME_STYLE),
|
||||
GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
|
||||
GetName());
|
||||
frame->SetClientSize(GetSize());
|
||||
frame->Move(GetPosition());
|
||||
if (HasParam(wxT("size")))
|
||||
frame->SetClientSize(GetSize());
|
||||
if (HasParam(wxT("pos")))
|
||||
frame->Move(GetPosition());
|
||||
SetupWindow(frame);
|
||||
|
||||
CreateChildren(frame);
|
||||
|
||||
if (GetBool(_("centered"), FALSE))
|
||||
if (GetBool(wxT("centered"), FALSE))
|
||||
frame->Centre();
|
||||
|
||||
return frame;
|
||||
@@ -79,7 +81,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
|
||||
|
||||
bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
|
||||
{
|
||||
return IsOfClass(node, _T("wxFrame"));
|
||||
return IsOfClass(node, wxT("wxFrame"));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user