From: Robert Roebling <robert@roebling.de>
Date: Thu, 24 Feb 2000 18:09:48 +0000 (+0000)
Subject:   Minor optical things.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b0e282b34d7bf24406bd6b94fab31fbe654253dd

  Minor optical things.


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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6101885d32..0d3a57eb35 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -483,7 +483,13 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
     // unix
     //
 #if defined(__WXGTK__)
-    rect.Inflate(rect.x ? 1 : 0, rect.y ? 1 : 0);
+    if (rect.x != 0)
+    {
+        rect.x += 1;
+        rect.y += 1;
+        rect.width -= 1;
+        rect.height -= 1;
+    }
 #else // !GTK
     int extra_x = ( rect.x > 2 )? 2 : 1;
     int extra_y = ( rect.y > 2 )? 2 : 1;
@@ -5455,9 +5461,10 @@ void wxGrid::ShowCellEditControl()
                                new wxGridCellEditorEvtHandler(this, editor));
             }
 
+            editor->Show( TRUE, attr );
+            
             editor->SetSize( rect );
 
-            editor->Show( TRUE, attr );
             editor->BeginEdit(row, col, this);
             attr->DecRef();
          }
diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index bcf26bcadb..d5efca072e 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -105,6 +105,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
         new_size.x = size_best.x;
     if (new_size.y == -1)
         new_size.y = size_best.y;
+    if (new_size.y > size_best.y)
+        new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
 
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index bcf26bcadb..d5efca072e 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -105,6 +105,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
         new_size.x = size_best.x;
     if (new_size.y == -1)
         new_size.y = size_best.y;
+    if (new_size.y > size_best.y)
+        new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
 
diff --git a/wxGTK.spec b/wxGTK.spec
index dc4fb85f3e..ac6e8b547b 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -70,5 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*
+%attr(755, -, -) %{pref}/bin/wxgtk-config
 %attr(755, -, -) %{pref}/bin/wx-config
 
diff --git a/wxMotif.spec b/wxMotif.spec
index 7c9b86dc9d..9e9e874dcd 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,7 +1,7 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.0
-%define rel 8
+%define ver 2.1.14
+%define rel 0
 
 Summary: The Motif port of the wxWindows library
 Name: wxMotif