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 6101885d328f0d576fd73088b1613f7b64ac8883..0d3a57eb3594ca45cf194ed0a5277f4fa03acc3d 100644 (file)
--- 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 bcf26bcadb1b7681379d10cfb1de4ed26d52337a..d5efca072e8da36ac9a2dad5d5231db6b127ee6f 100644 (file)
--- 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 bcf26bcadb1b7681379d10cfb1de4ed26d52337a..d5efca072e8da36ac9a2dad5d5231db6b127ee6f 100644 (file)
--- 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 dc4fb85f3ed91451aefb74b241ed3b1a2ecb315e..ac6e8b547b92e8790ac9ea55943aab1cc1f8af85 100644 (file)
--- 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 7c9b86dc9dbb08f12113319730aa0bf701fc031c..9e9e874dcd0c1011339c92e5ecfe9ac36f805003 100644 (file)
--- 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