Remove Debian/Lenny workarounds
definitively requiring Squeeze now
This commit is contained in:
parent
77548e74c6
commit
34f2de641f
2 changed files with 12 additions and 15 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# -*- python -*-
|
||||
##
|
||||
## SConstruct - SCons based build-sytem for Lumiera
|
||||
## SConstruct - SCons based build-system for Lumiera
|
||||
##
|
||||
|
||||
# Copyright (C) Lumiera.org
|
||||
|
|
@ -52,8 +52,9 @@ installIcon = '#$DESTDIR/share/lumiera/icons'
|
|||
installUIRes = '#$DESTDIR/share/lumiera/'
|
||||
installConf = '#$DESTDIR/lib/lumiera/config'
|
||||
|
||||
localDefinitions = locals()
|
||||
#-----------------------------------Configuration
|
||||
localDefinitions = locals()
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -87,8 +88,6 @@ def setupBasicEnvironment(localDefinitions):
|
|||
)
|
||||
handleVerboseMessages(env)
|
||||
|
||||
env.Append ( CCCOM=' -std=gnu99')
|
||||
env.Append ( SHCCCOM=' -std=gnu99') # workaround for a bug: CCCOM currently doesn't honour CFLAGS, only CCFLAGS
|
||||
env.Replace( CPPPATH =["#src"] # used to find includes, "#" means always absolute to build-root
|
||||
, CPPDEFINES=['LUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines
|
||||
, CCFLAGS='-Wall -Wextra '
|
||||
|
|
|
|||
|
|
@ -189,8 +189,7 @@ TimeCode::set_widget_name(string name)
|
|||
void
|
||||
TimeCode::setup_events()
|
||||
{
|
||||
// FIXME: change to set_can_focus(true) once Debian squeeze is released
|
||||
clock_base.set_flags(CAN_FOCUS);
|
||||
clock_base.set_can_focus(true);
|
||||
|
||||
const Gdk::EventMask eventMask =
|
||||
Gdk::BUTTON_PRESS_MASK|
|
||||
|
|
@ -210,15 +209,14 @@ TimeCode::setup_events()
|
|||
ms_seconds_ebox.add_events(eventMask);
|
||||
audio_frames_ebox.add_events(eventMask);
|
||||
|
||||
// FIXME: change to set_can_focus(true) once Debian squeeze is released
|
||||
hours_ebox.set_flags(CAN_FOCUS);
|
||||
minutes_ebox.set_flags(CAN_FOCUS);
|
||||
seconds_ebox.set_flags(CAN_FOCUS);
|
||||
frames_ebox.set_flags(CAN_FOCUS);
|
||||
audio_frames_ebox.set_flags(CAN_FOCUS);
|
||||
ms_hours_ebox.set_flags(CAN_FOCUS);
|
||||
ms_minutes_ebox.set_flags(CAN_FOCUS);
|
||||
ms_seconds_ebox.set_flags(CAN_FOCUS);
|
||||
hours_ebox.set_can_focus(true);
|
||||
minutes_ebox.set_can_focus(true);
|
||||
seconds_ebox.set_can_focus(true);
|
||||
frames_ebox.set_can_focus(true);
|
||||
audio_frames_ebox.set_can_focus(true);
|
||||
ms_hours_ebox.set_can_focus(true);
|
||||
ms_minutes_ebox.set_can_focus(true);
|
||||
ms_seconds_ebox.set_can_focus(true);
|
||||
|
||||
hours_ebox.signal_motion_notify_event().connect(bind(mem_fun(
|
||||
*this, &TimeCode::field_motion_notify_event), SMPTE_Hours));
|
||||
|
|
|
|||
Loading…
Reference in a new issue