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

cosmetic changes in help browser settings dlg; fixed problem with Borland C++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 1999-12-01 22:29:02 +00:00
parent fcc3d7cbad
commit f151e8b583
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/html/helpfrm.cpp
View File

@ -582,21 +582,13 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size) static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size)
{ {
#ifdef __WXMSW__
static int f_sizes[3][7] = static int f_sizes[3][7] =
{ {
{ 8, 9, 12, 14, 16, 19, 22},
{10, 12, 14, 16, 19, 24, 32}, {10, 12, 14, 16, 19, 24, 32},
{12, 14, 16, 18, 24, 32, 38},
{14, 16, 18, 24, 32, 38, 45} {14, 16, 18, 24, 32, 38, 45}
}; };
#else
static int f_sizes[3][7] =
{
{10, 12, 14, 16, 19, 24, 32},
{12, 14, 16, 18, 24, 32, 38},
{14, 16, 18, 24, 32, 38, 45}
};
#endif
win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]); win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
} }
@ -604,15 +596,15 @@ static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxS
class wxHtmlHelpFrameOptionsDialog : public wxDialog class wxHtmlHelpFrameOptionsDialog : public wxDialog
{ {
public: public:
wxListBox *NormalFont, *FixedFont; wxComboBox *NormalFont, *FixedFont;
wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s; wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s;
wxRadioBox *RadioBox; wxRadioBox *RadioBox;
wxHtmlWindow *TestWin; wxHtmlWindow *TestWin;
wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options"))) wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
{ {
static wxString choices[3] = {_("small"), _("medium"), _("large")}; wxString choices[3] = {_("small"), _("medium"), _("large")};
static wxString choices2[2] = {_("italic"), _("slant")}; wxString choices2[2] = {_("italic"), _("slant")};
wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3; wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3;
topsizer = new wxBoxSizer(wxVERTICAL); topsizer = new wxBoxSizer(wxVERTICAL);
@ -622,7 +614,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
sizer2 = new wxBoxSizer(wxVERTICAL); sizer2 = new wxBoxSizer(wxVERTICAL);
sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")),
0, wxLEFT | wxTOP, 10); 0, wxLEFT | wxTOP, 10);
sizer2 -> Add(NormalFont = new wxListBox(this, -1, wxDefaultPosition, wxSize(200, 150)), sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10); 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer3 = new wxBoxSizer(wxHORIZONTAL); sizer3 = new wxBoxSizer(wxHORIZONTAL);
@ -637,7 +629,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
sizer2 = new wxBoxSizer(wxVERTICAL); sizer2 = new wxBoxSizer(wxVERTICAL);
sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")),
0, wxLEFT | wxTOP, 10); 0, wxLEFT | wxTOP, 10);
sizer2 -> Add(FixedFont = new wxListBox(this, -1, wxDefaultPosition, wxSize(200, 150)), sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10); 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
sizer3 = new wxBoxSizer(wxHORIZONTAL); sizer3 = new wxBoxSizer(wxHORIZONTAL);
@ -711,7 +703,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
}; };
BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog) BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
EVT_LISTBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
END_EVENT_TABLE() END_EVENT_TABLE()