AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor optical changes to toolbar and the help frame's

Browse Source 
options dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-12-20 20:16:37 +00:00
parent c25a510b30
commit 6f67eafe67
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/tbargtk.cpp
View File

@ -316,6 +316,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;
// we have inserted a space before all the tools
if (m_xMargin > 1) pos++;
if ( tool->IsButton() )
{
wxBitmap bitmap = tool->GetBitmap1();
@ -399,7 +402,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
m_width = req.width + m_xMargin;
m_height = req.height + 2*m_yMargin + 4;
m_height = req.height + 2*m_yMargin;
return TRUE;
}

5
src/gtk1/tbargtk.cpp
View File

@ -316,6 +316,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;
// we have inserted a space before all the tools
if (m_xMargin > 1) pos++;
if ( tool->IsButton() )
{
wxBitmap bitmap = tool->GetBitmap1();
@ -399,7 +402,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
m_width = req.width + m_xMargin;
m_height = req.height + 2*m_yMargin + 4;
m_height = req.height + 2*m_yMargin;
return TRUE;
}

16
src/html/helpfrm.cpp
View File

@ -717,9 +717,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer2 = new wxBoxSizer(wxVERTICAL);
sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")),
0, wxLEFT | wxTOP, 10);
sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL);
sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
wxSize(200, 200),
0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
@ -732,11 +730,9 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
1, wxEXPAND, 0);
sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
sizer2 = new wxBoxSizer(wxVERTICAL);
sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")),
0, wxLEFT | wxTOP, 10);
sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
wxSize(200, 200),
0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
@ -749,18 +745,18 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
1, wxEXPAND, 0);
sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
topsizer -> Add(sizer);
topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"),
wxDefaultPosition, wxDefaultSize, 3, choices, 3),
0, wxEXPAND | wxLEFT | wxRIGHT, 10);
0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
topsizer -> Add(new wxStaticText(this, -1, _("Preview:")),
0, wxLEFT | wxTOP, 10);
topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)),
1, wxEXPAND | wxLEFT | wxTOP, 10);
1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);