Fix wxChoice height problem under wxGTK-2.6.0 (GTK+-2.0).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1982 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 6816822d8e06c67b33bf83a6cce1939cc9ec8605..7f43e38a43219b5f8a10dc08e607af29635129c9 100644 (file)
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,3 +1,6 @@
+03-05-2005:
+ - Fix wxChoice height problem under wxGTK-2.6.0 (GTK+-2.0).
+
 26-04-2005 :
  - Improve error handling when reading configuration file.
  - Fixes compile error with unicode-enabled wxWidgets.

diff --git a/bacula/src/wx-console/wxbconfigpanel.cpp b/bacula/src/wx-console/wxbconfigpanel.cpp
index 9c9434cbdeda33bf0d79a0d3aeb369fa2ead31e9..1b5bc8d903570b98265bcf9c71dfe35ba69fe706 100644 (file)
--- a/bacula/src/wx-console/wxbconfigpanel.cpp
+++ b/bacula/src/wx-console/wxbconfigpanel.cpp
@@ -65,7 +65,7 @@ wxbConfigParam::~wxbConfigParam() {
 }
   
 void wxbConfigParam::AddControl(wxWindow* parent, wxSizer* sizer) {
-   sizer->Add(new wxStaticText(parent, -1, title + ": ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 0, wxEXPAND | wxALIGN_CENTER_HORIZONTAL);
+   sizer->Add(new wxStaticText(parent, -1, title + ": ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 0, wxALIGN_CENTER_VERTICAL);
    switch (type) {
    case text:
       statictext = new wxStaticText(parent, -1, value, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
@@ -76,7 +76,12 @@ void wxbConfigParam::AddControl(wxWindow* parent, wxSizer* sizer) {
       sizer->Add(textctrl, 1, wxEXPAND | wxADJUST_MINSIZE);
       break;
    case choice:
-      choicectrl = new wxChoice(parent, id, wxDefaultPosition, wxSize(150, 20), nvalues, values);
+#if defined __WXGTK20__ /* Choices are taller under GTK+-2.0 */
+      wxSize size = wxSize(150, 25);
+#else
+      wxSize size = wxSize(150, 20);
+#endif
+      choicectrl = new wxChoice(parent, id, wxDefaultPosition, size, nvalues, values);
       sizer->Add(choicectrl, 1, wxEXPAND);
       break;
    }