projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken and missing DataView interface items for Phoenix
[wxWidgets.git]
/
src
/
gtk
/
spinbutt.cpp
diff --git
a/src/gtk/spinbutt.cpp
b/src/gtk/spinbutt.cpp
index 748bf04ec3066eb86e351b7d81fc32c6c3442851..5cb5b6bb897a175a0f4967a3df2f3faa44f4ffef 100644
(file)
--- a/
src/gtk/spinbutt.cpp
+++ b/
src/gtk/spinbutt.cpp
@@
-38,7
+38,7
@@
gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
const double value = gtk_spin_button_get_value(spinbutton);
const int pos = int(value);
const int oldPos = win->m_pos;
const double value = gtk_spin_button_get_value(spinbutton);
const int pos = int(value);
const int oldPos = win->m_pos;
- if (
!win->m_hasVMT ||
g_blockEventsOnDrag || pos == oldPos)
+ if (g_blockEventsOnDrag || pos == oldPos)
{
win->m_pos = pos;
return;
{
win->m_pos = pos;
return;
@@
-48,13
+48,13
@@
gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
event.SetPosition(pos);
event.SetEventObject(win);
event.SetPosition(pos);
event.SetEventObject(win);
- if ((win->
GetEventHandler()->Process
Event( event )) &&
+ if ((win->
HandleWindow
Event( event )) &&
!event.IsAllowed() )
{
/* program has vetoed */
!event.IsAllowed() )
{
/* program has vetoed */
- win->BlockScrollEvent();
+ // this will cause another "value_changed" signal,
+ // but because pos == oldPos nothing will happen
gtk_spin_button_set_value(spinbutton, oldPos);
gtk_spin_button_set_value(spinbutton, oldPos);
- win->UnblockScrollEvent();
return;
}
return;
}
@@
-64,7
+64,7
@@
gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId());
event2.SetPosition(pos);
event2.SetEventObject(win);
wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId());
event2.SetPosition(pos);
event2.SetEventObject(win);
- win->
GetEventHandler()->Process
Event(event2);
+ win->
HandleWindow
Event(event2);
}
}
}
}
@@
-72,9
+72,6
@@
gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
// wxSpinButton
//-----------------------------------------------------------------------------
// wxSpinButton
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)
END_EVENT_TABLE()
@@
-107,6
+104,7
@@
bool wxSpinButton::Create(wxWindow *parent,
m_pos = 0;
m_widget = gtk_spin_button_new_with_range(0, 100, 1);
m_pos = 0;
m_widget = gtk_spin_button_new_with_range(0, 100, 1);
+ g_object_ref(m_widget);
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
(int)(m_windowStyle & wxSP_WRAP) );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
(int)(m_windowStyle & wxSP_WRAP) );
@@
-162,6
+160,7
@@
void wxSpinButton::SetRange(int minVal, int maxVal)
GtkDisableEvents();
gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
GtkDisableEvents();
gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
+ m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));
GtkEnableEvents();
}
GtkEnableEvents();
}
@@
-173,6
+172,18
@@
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
gtk_widget_set_size_request( m_widget, m_width, m_height );
}
gtk_widget_set_size_request( m_widget, m_width, m_height );
}
+bool wxSpinButton::Enable( bool enable )
+{
+ if (!base_type::Enable(enable))
+ return false;
+
+ // Work around lack of visual update when enabling
+ if (enable)
+ GTKFixSensitivity(false /* fix even if not under mouse */);
+
+ return true;
+}
+
void wxSpinButton::GtkDisableEvents() const
{
g_signal_handlers_block_by_func(m_widget,
void wxSpinButton::GtkDisableEvents() const
{
g_signal_handlers_block_by_func(m_widget,
@@
-187,7
+198,12
@@
void wxSpinButton::GtkEnableEvents() const
GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
+#ifdef __WXGTK3__
+ // no access to internal GdkWindows
+ return NULL;
+#else
return GTK_SPIN_BUTTON(m_widget)->panel;
return GTK_SPIN_BUTTON(m_widget)->panel;
+#endif
}
wxSize wxSpinButton::DoGetBestSize() const
}
wxSize wxSpinButton::DoGetBestSize() const