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

removed platform specific #ifdefs around wxComboBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-10 21:46:00 +00:00
parent 151d66be0f
commit 6bfd5671b0
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/helpfrm.cpp
View File

@@ -681,11 +681,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
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 wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
//#ifdef __WXMSW__
wxSize(200, 200), wxSize(200, 200),
//#else
// wxSize(200, -1),
//#endif // FIXME: temporarily commented by VS to demonstrate the problem
0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10); 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
@@ -702,11 +698,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
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 wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
//#ifdef __WXMSW__
wxSize(200, 200), wxSize(200, 200),
//#else
// wxSize(200, -1),
//#endif // FIXME: temporarily commented by VS to demonstrate the problem
0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10); 1, wxEXPAND | wxLEFT | wxRIGHT, 10);