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

get correct best size for wxSpinButton

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-11-02 16:29:21 +00:00
parent 5992503b62
commit 3a6e307771
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/spinbutt.h
View File

@@ -47,8 +47,6 @@ public:
virtual bool Enable( bool enable = true ); virtual bool Enable( bool enable = true );
// implementation // implementation
void OnSize( wxSizeEvent &event );
int m_pos; int m_pos;
protected: protected:
@@ -61,9 +59,7 @@ protected:
private: private:
typedef wxSpinButtonBase base_type; typedef wxSpinButtonBase base_type;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxSpinButton) DECLARE_DYNAMIC_CLASS(wxSpinButton)
}; };
#endif #endif // _WX_GTK_SPINBUTT_H_
// _WX_GTK_SPINBUTT_H_

46
src/gtk/spinbutt.cpp
View File

@@ -14,10 +14,6 @@
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -71,10 +67,6 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
// wxSpinButton // wxSpinButton
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)
END_EVENT_TABLE()
wxSpinButton::wxSpinButton() wxSpinButton::wxSpinButton()
{ {
m_pos = 0; m_pos = 0;
@@ -87,14 +79,8 @@ bool wxSpinButton::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
wxSize new_size = size, if (!PreCreation(parent, pos, size) ||
sizeBest = DoGetBestSize(); !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name))
new_size.x = sizeBest.x; // override width always
if (new_size.y == -1)
new_size.y = sizeBest.y;
if (!PreCreation( parent, pos, new_size ) ||
!CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxSpinButton creation failed") ); wxFAIL_MSG( wxT("wxSpinButton creation failed") );
return false; return false;
@@ -105,6 +91,7 @@ bool wxSpinButton::Create(wxWindow *parent,
m_widget = gtk_spin_button_new_with_range(0, 100, 1); m_widget = gtk_spin_button_new_with_range(0, 100, 1);
g_object_ref(m_widget); g_object_ref(m_widget);
gtk_entry_set_width_chars(GTK_ENTRY(m_widget), 0);
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
(int)(m_windowStyle & wxSP_WRAP) ); (int)(m_windowStyle & wxSP_WRAP) );
@@ -113,7 +100,7 @@ bool wxSpinButton::Create(wxWindow *parent,
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
PostCreation(new_size); PostCreation(size);
return true; return true;
} }
@@ -163,14 +150,6 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
GtkEnableEvents(); GtkEnableEvents();
} }
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
m_width = DoGetBestSize().x;
gtk_widget_set_size_request( m_widget, m_width, m_height );
}
bool wxSpinButton::Enable( bool enable ) bool wxSpinButton::Enable( bool enable )
{ {
if (!base_type::Enable(enable)) if (!base_type::Enable(enable))
@@ -207,13 +186,20 @@ GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) cons
wxSize wxSpinButton::DoGetBestSize() const wxSize wxSpinButton::DoGetBestSize() const
{ {
int width = wxSize best = base_type::DoGetBestSize();
#ifdef __WXGTK3__ #ifdef __WXGTK3__
48; GtkStyleContext* sc = gtk_widget_get_style_context(m_widget);
GtkBorder pad = { 0, 0, 0, 0 };
gtk_style_context_get_padding(sc, GtkStateFlags(0), &pad);
best.x -= pad.left + pad.right;
#else #else
15; gtk_widget_ensure_style(m_widget);
int w = PANGO_PIXELS(pango_font_description_get_size(m_widget->style->font_desc));
w &= ~1;
if (w < 6)
w = 6;
best.x = w + 2 * m_widget->style->xthickness;
#endif #endif
wxSize best(width, 26); // FIXME
CacheBestSize(best); CacheBestSize(best);
return best; return best;
} }
@@ -225,4 +211,4 @@ wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1)); return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1));
} }
#endif #endif // wxUSE_SPINBTN