[dasher] Remove instances of gnome 3 deprecated GtkObject.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Remove instances of gnome 3 deprecated GtkObject.
- Date: Thu, 21 Oct 2010 17:41:37 +0000 (UTC)
commit 0f035c3177c26d1045afd3809cacb5674c5a523b
Author: Patrick Welche <prlw1 cam ac uk>
Date: Thu Oct 21 18:39:56 2010 +0100
Remove instances of gnome 3 deprecated GtkObject.
Fix for Bug 632071 from Marin Moulinier.
Src/Gtk2/DasherControl.cpp | 26 +++++++++++++-------------
Src/Gtk2/dasher_main.cpp | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/Src/Gtk2/DasherControl.cpp b/Src/Gtk2/DasherControl.cpp
index d7a5cc2..a5ae24e 100644
--- a/Src/Gtk2/DasherControl.cpp
+++ b/Src/Gtk2/DasherControl.cpp
@@ -237,7 +237,7 @@ bool CDasherControl::FocusEvent(GtkWidget *pWidget, GdkEventFocus *pEvent) {
focusEvent->send_event = FALSE;
focusEvent->in = TRUE;
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "focus_in_event", GTK_WIDGET(m_pDasherControl), focusEvent, NULL, &returnType);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "focus_in_event", GTK_WIDGET(m_pDasherControl), focusEvent, NULL, &returnType);
}
return true;
}
@@ -321,33 +321,33 @@ void CDasherControl::ExternalEventHandler(Dasher::CEvent *pEvent) {
if(pEvent->m_iEventType == EV_PARAM_NOTIFY) {
Dasher::CParameterNotificationEvent * pEvt(static_cast < Dasher::CParameterNotificationEvent * >(pEvent));
HandleParameterNotification(pEvt->m_iParameter);
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_changed", pEvt->m_iParameter);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_changed", pEvt->m_iParameter);
}
else if(pEvent->m_iEventType == EV_EDIT) {
CEditEvent *pEditEvent(static_cast < CEditEvent * >(pEvent));
if(pEditEvent->m_iEditType == 1) {
// Insert event
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_edit_insert", pEditEvent->m_sText.c_str(), pEditEvent->m_iOffset);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_edit_insert", pEditEvent->m_sText.c_str(), pEditEvent->m_iOffset);
}
else if(pEditEvent->m_iEditType == 2) {
// Delete event
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_edit_delete", pEditEvent->m_sText.c_str(), pEditEvent->m_iOffset);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_edit_delete", pEditEvent->m_sText.c_str(), pEditEvent->m_iOffset);
}
else if(pEditEvent->m_iEditType == 10) {
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_edit_convert");
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_edit_convert");
}
else if(pEditEvent->m_iEditType == 11) {
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_edit_protect");
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_edit_protect");
}
}
else if(pEvent->m_iEventType == EV_EDIT_CONTEXT) {
CEditContextEvent *pEditContextEvent(static_cast < CEditContextEvent * >(pEvent));
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_context_request", pEditContextEvent->m_iOffset, pEditContextEvent->m_iLength);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_context_request", pEditContextEvent->m_iOffset, pEditContextEvent->m_iLength);
}
else if(pEvent->m_iEventType == EV_CONTROL) {
CControlEvent *pControlEvent(static_cast < CControlEvent * >(pEvent));
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_control", pControlEvent->m_iID);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_control", pControlEvent->m_iID);
}
else if(pEvent->m_iEventType == EV_LOCK) {
CLockEvent *pLockEvent(static_cast<CLockEvent *>(pEvent));
@@ -356,7 +356,7 @@ void CDasherControl::ExternalEventHandler(Dasher::CEvent *pEvent) {
sInfo.bLock = pLockEvent->m_bLock;
sInfo.iPercent = pLockEvent->m_iPercent;
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_lock_info", &sInfo);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_lock_info", &sInfo);
}
else if(pEvent->m_iEventType == EV_MESSAGE) {
CMessageEvent *pMessageEvent(static_cast<CMessageEvent *>(pEvent));
@@ -365,11 +365,11 @@ void CDasherControl::ExternalEventHandler(Dasher::CEvent *pEvent) {
sInfo.iID = pMessageEvent->m_iID;
sInfo.iType = pMessageEvent->m_iType;
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_message", &sInfo);
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_message", &sInfo);
}
else if(pEvent->m_iEventType == EV_COMMAND) {
CCommandEvent *pCommandEvent(static_cast<CCommandEvent *>(pEvent));
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_command", pCommandEvent->m_strCommand.c_str());
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_command", pCommandEvent->m_strCommand.c_str());
}
};
@@ -501,7 +501,7 @@ gboolean CDasherControl::ExposeEvent() {
void CDasherControl::Stop() {
if (GetBoolParameter(BP_DASHER_PAUSED)) return;
CDasherInterfaceBase::Stop();
- g_signal_emit_by_name(GTK_OBJECT(m_pDasherControl), "dasher_stop");
+ g_signal_emit_by_name(GTK_WIDGET(m_pDasherControl), "dasher_stop");
}
gboolean CDasherControl::ButtonPressEvent(GdkEventButton *event) {
@@ -517,7 +517,7 @@ gboolean CDasherControl::ButtonPressEvent(GdkEventButton *event) {
// focusEvent->in = TRUE;
// gtk_widget_grab_focus(GTK_WIDGET(m_pCanvas));
-// g_signal_emit_by_name(GTK_OBJECT(m_pCanvas), "focus_in_event", GTK_WIDGET(m_pCanvas), focusEvent, NULL, &returnType);
+// g_signal_emit_by_name(GTK_WIDGET(m_pCanvas), "focus_in_event", GTK_WIDGET(m_pCanvas), focusEvent, NULL, &returnType);
// No - don't take the focus - give it to the text area instead
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index f3376a2..3ed5088 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -1283,7 +1283,7 @@ edit_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
// if(g_bForwardKeyboard) {
// gboolean *returnType;
-// g_signal_emit_by_name(GTK_OBJECT(pPrivate->pDasherWidget), "key_press_event", event, &returnType);
+// g_signal_emit_by_name(GTK_WIDGET(pPrivate->pDasherWidget), "key_press_event", event, &returnType);
// return true;
// }
// else {
@@ -1300,7 +1300,7 @@ edit_key_release(GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
// if(g_bForwardKeyboard) {
// gboolean *returnType;
-// g_signal_emit_by_name(GTK_OBJECT(pPrivate->pDasherWidget), "key_release_event", event, &returnType);
+// g_signal_emit_by_name(GTK_WIDGET(pPrivate->pDasherWidget), "key_release_event", event, &returnType);
// return true;
// }
// else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]