gtk_timeout_add -> g_timeout_add
gtk_timeout_remove -> g_source_remove
This commit is contained in:
parent
0ba68e1a29
commit
dac8fd48a3
|
|
@ -1796,7 +1796,7 @@ void Selection_SnapToGrid(){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static gint qe_every_second( gpointer data ){
|
static gboolean qe_every_second( gpointer data ){
|
||||||
GdkModifierType mask;
|
GdkModifierType mask;
|
||||||
|
|
||||||
gdk_window_get_pointer( 0, 0, 0, &mask );
|
gdk_window_get_pointer( 0, 0, 0, &mask );
|
||||||
|
|
@ -1812,13 +1812,13 @@ guint s_qe_every_second_id = 0;
|
||||||
|
|
||||||
void EverySecondTimer_enable(){
|
void EverySecondTimer_enable(){
|
||||||
if ( s_qe_every_second_id == 0 ) {
|
if ( s_qe_every_second_id == 0 ) {
|
||||||
s_qe_every_second_id = gtk_timeout_add( 1000, qe_every_second, 0 );
|
s_qe_every_second_id = g_timeout_add( 1000, qe_every_second, 0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void EverySecondTimer_disable(){
|
void EverySecondTimer_disable(){
|
||||||
if ( s_qe_every_second_id != 0 ) {
|
if ( s_qe_every_second_id != 0 ) {
|
||||||
gtk_timeout_remove( s_qe_every_second_id );
|
g_source_remove( s_qe_every_second_id );
|
||||||
s_qe_every_second_id = 0;
|
s_qe_every_second_id = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -471,7 +471,7 @@ static xmlSAXHandler saxParser = {
|
||||||
|
|
||||||
|
|
||||||
guint s_routine_id = 0;
|
guint s_routine_id = 0;
|
||||||
static gint watchbsp_routine( gpointer data ){
|
static gboolean watchbsp_routine( gpointer data ){
|
||||||
reinterpret_cast<CWatchBSP*>( data )->RoutineProcessing();
|
reinterpret_cast<CWatchBSP*>( data )->RoutineProcessing();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
@ -491,7 +491,7 @@ void CWatchBSP::Reset(){
|
||||||
}
|
}
|
||||||
m_eState = EIdle;
|
m_eState = EIdle;
|
||||||
if ( s_routine_id != 0 ) {
|
if ( s_routine_id != 0 ) {
|
||||||
gtk_timeout_remove( s_routine_id );
|
g_source_remove( s_routine_id );
|
||||||
s_routine_id = 0;
|
s_routine_id = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -544,7 +544,7 @@ void CWatchBSP::DoEBeginStep(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_eState = EBeginStep;
|
m_eState = EBeginStep;
|
||||||
s_routine_id = gtk_timeout_add( 25, watchbsp_routine, this );
|
s_routine_id = g_timeout_add( 25, watchbsp_routine, this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user