Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing OGL files; added defaults to wxDocMDIParentFrame; corrected

Browse Source 
toolbar usage in Dialog Editor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-29 10:43:51 +00:00
parent 8dad2ab39e
commit f449ef69b4
29 changed files with 2150 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/dialoged/src/reseditr.cpp
View File

@@ -732,10 +732,8 @@ wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
#endif
// Create the toolbar
EditorToolBar *toolbar = new EditorToolBar(parent, wxPoint(0, 0), wxSize(-1, -1), wxNO_BORDER,
wxVERTICAL, 1);
EditorToolBar *toolbar = new EditorToolBar(parent, wxPoint(0, 0), wxSize(-1, -1), wxNO_BORDER|wxTB_HORIZONTAL);
toolbar->SetMargins(2, 2);
// toolbar->GetDC()->SetBackground(wxLIGHT_GREY_BRUSH);
#ifdef __WXMSW__
int width = 24;
@@ -792,11 +790,9 @@ wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
FALSE, (float)currentX, -1, NULL, "Help");
currentX += width + dx;
toolbar->CreateTools();
toolbar->Realize();
return toolbar;
// parent->OnSize(-1, -1);
}
void wxResourceManager::UpdateResourceList()
@@ -1965,8 +1961,8 @@ BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
END_EVENT_TABLE()
EditorToolBar::EditorToolBar(wxFrame *frame, const wxPoint& pos, const wxSize& size,
long style, int direction, int RowsOrColumns):
wxToolBar(frame, -1, pos, size, style, direction, RowsOrColumns)
long style):
wxToolBar(frame, -1, pos, size, style)
{
}