removed platform specific #ifdefs around wxComboBox

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 08bf9f3de77da7d03826d71cc98314618a95f6ab..573121b725ace06a1725056e1620274980084885 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -681,11 +681,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                 sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                 sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
                               0, wxLEFT | wxTOP, 10);
                 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),
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 


@@ -702,11 +698,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                 sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                 sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
                               0, wxLEFT | wxTOP, 10);
                 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), 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);