wxX11:
Made timer compile and maybe work. Fixed display bug in wxListCtrl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -203,7 +203,7 @@ protected:
|
||||
|
||||
private:
|
||||
// Virtual function hiding supression
|
||||
virtual void Update() { wxWindowBase::Update(); }
|
||||
virtual void Update() { wxWindow::Update(); }
|
||||
|
||||
// create the header window
|
||||
void CreateHeaderWindow();
|
||||
|
@@ -4581,7 +4581,7 @@ bool wxListCtrl::Create(wxWindow *parent,
|
||||
style = style | wxLC_LIST;
|
||||
}
|
||||
|
||||
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
|
||||
if ( !wxControl::Create( parent, id, pos, size, style, validator, "listctrl" ) )
|
||||
return FALSE;
|
||||
|
||||
// don't create the inner window with the border
|
||||
|
@@ -63,11 +63,11 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
|
||||
if ( desc->running )
|
||||
return; // already scheduled
|
||||
|
||||
#pragma
|
||||
#if 0
|
||||
if ( when == 0 )
|
||||
when = wxGetLocalTimeMillis() + desc->timer->GetInterval();
|
||||
#endif
|
||||
{
|
||||
unsigned long local = wxGetLocalTimeMillis().ToLong();
|
||||
when = local + desc->timer->GetInterval();
|
||||
}
|
||||
desc->shotTime = when;
|
||||
desc->running = TRUE;
|
||||
|
||||
@@ -109,11 +109,7 @@ void wxTimerScheduler::NotifyTimers()
|
||||
{
|
||||
bool oneShot;
|
||||
volatile bool timerDeleted;
|
||||
#pragma
|
||||
unsigned long now;
|
||||
#if 0
|
||||
now = wxGetLocalTimeMillis();
|
||||
#endif
|
||||
unsigned long now = wxGetLocalTimeMillis().ToLong();
|
||||
wxTimerDesc *desc;
|
||||
|
||||
while ( m_timers && m_timers->shotTime <= now )
|
||||
|
@@ -933,7 +933,6 @@ void wxWindowX11::X11SendPaintEvents()
|
||||
|
||||
if (!GetEventHandler()->ProcessEvent(erase_event))
|
||||
{
|
||||
printf( "Hallo!\n" );
|
||||
Window xwindow = (Window) GetMainWindow();
|
||||
Display *xdisplay = wxGlobalDisplay();
|
||||
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
|
||||
@@ -946,6 +945,7 @@ void wxWindowX11::X11SendPaintEvents()
|
||||
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
|
||||
upd ++;
|
||||
}
|
||||
XFreeGC( xdisplay, xgc );
|
||||
}
|
||||
m_clearRegion.Clear();
|
||||
}
|
||||
|
Reference in New Issue
Block a user