wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -192,7 +192,7 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
|
||||
|
||||
wxConfigBase *cfg = wxConfigBase::Get();
|
||||
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("editor_x"), wxDefaultPosition.x), cfg->Read(_T("editor_y"), wxDefaultPosition.y)),
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("editor_x"), wxDefaultCoord), cfg->Read(_T("editor_y"), wxDefaultCoord)),
|
||||
wxSize(cfg->Read(_T("editor_w"), 400), cfg->Read(_T("editor_h"), 400))));
|
||||
|
||||
m_SelectedNode = NULL;
|
||||
@@ -228,16 +228,16 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
|
||||
toolBar->SetMargins(2, 2);
|
||||
toolBar->SetToolBitmapSize(wxSize(24, 24));
|
||||
toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap,
|
||||
false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
|
||||
false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
|
||||
_("Quit the editor"));
|
||||
toolBar -> AddTool(ID_OPEN, wxBITMAP(open), wxNullBitmap,
|
||||
false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
|
||||
false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
|
||||
_("Open XML resource file"));
|
||||
toolBar -> AddTool(ID_SAVE, wxBITMAP(save), wxNullBitmap,
|
||||
false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
|
||||
false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
|
||||
_("Save XML file"));
|
||||
toolBar -> AddTool(ID_PREVIEW, wxBITMAP(preview), wxNullBitmap,
|
||||
false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
|
||||
false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
|
||||
_("Preview"));
|
||||
toolBar -> Realize();
|
||||
|
||||
|
@@ -151,7 +151,7 @@ void PropEditCtrlFlags::OnDetails()
|
||||
wxConfigBase *cfg = wxConfigBase::Get();
|
||||
|
||||
wxDialog dlg(m_PropFrame, wxID_ANY, _("Flags"),
|
||||
wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultPosition.x), cfg->Read(_T("flagsdlg_y"), wxDefaultPosition.y)),
|
||||
wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultCoord), cfg->Read(_T("flagsdlg_y"), wxDefaultCoord)),
|
||||
wxSize(cfg->Read(_T("flagsdlg_w"), 300), cfg->Read(_T("flagsdlg_h"), 300)),
|
||||
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
|
||||
wxSizer *sz = new wxBoxSizer(wxVERTICAL);
|
||||
|
@@ -80,7 +80,7 @@ PreviewFrame::PreviewFrame()
|
||||
ResetResource();
|
||||
|
||||
wxConfigBase *cfg = wxConfigBase::Get();
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("previewframe_x"), wxDefaultPosition.x), cfg->Read(_T("previewframe_y"), wxDefaultPosition.y)),
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("previewframe_x"), wxDefaultCoord), cfg->Read(_T("previewframe_y"), wxDefaultCoord)),
|
||||
wxSize(cfg->Read(_T("previewframe_w"), 400), cfg->Read(_T("previewframe_h"), 400))));
|
||||
|
||||
m_Splitter = new wxSplitterWindow(this, wxID_ANY);
|
||||
|
@@ -62,10 +62,10 @@ void PropEditCtrl::BeginEdit(const wxRect& rect, wxTreeItemId ti)
|
||||
sz->Add(m_TheCtrl, 1);
|
||||
if (HasDetails())
|
||||
sz->Add(new wxButton(this, ID_DETAILS, _T("..."), wxDefaultPosition,
|
||||
wxSize(16,wxDefaultSize.y)));
|
||||
wxSize(16,wxDefaultCoord)));
|
||||
if (HasClearButton())
|
||||
sz->Add(new wxButton(this, ID_CLEAR, _T("X"), wxDefaultPosition,
|
||||
wxSize(16,wxDefaultSize.y)));
|
||||
wxSize(16,wxDefaultCoord)));
|
||||
SetSizer(sz);
|
||||
m_Created = true;
|
||||
}
|
||||
|
@@ -129,7 +129,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
|
||||
wxRect bounding;
|
||||
GetBoundingRect(id, bounding);
|
||||
|
||||
m_EditCtrl->Move(wxDefaultPosition.x, bounding.y);
|
||||
m_EditCtrl->Move(wxDefaultCoord, bounding.y);
|
||||
}
|
||||
|
||||
PropEditCtrl *m_EditCtrl;
|
||||
@@ -245,7 +245,7 @@ PropertiesFrame::PropertiesFrame()
|
||||
m_tree->SetCompanionWindow(m_valueWindow);
|
||||
|
||||
wxConfigBase *cfg = wxConfigBase::Get();
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultPosition.x), cfg->Read(_T("propertiesframe_y"), wxDefaultPosition.y)),
|
||||
SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultCoord), cfg->Read(_T("propertiesframe_y"), wxDefaultCoord)),
|
||||
wxSize(cfg->Read(_T("propertiesframe_w"), 200), cfg->Read(_T("propertiesframe_h"), 200))));
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user