Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxX11:

Browse Source 
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:
Robert Roebling
2002-02-16 10:59:55 +00:00
parent ca39e4095a
commit 8ac7c50924
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/listctrl.h
View File

@@ -203,7 +203,7 @@ protected:
private: private:
// Virtual function hiding supression // Virtual function hiding supression
virtual void Update() { wxWindowBase::Update(); } virtual void Update() { wxWindow::Update(); }
// create the header window // create the header window
void CreateHeaderWindow(); void CreateHeaderWindow();

2
src/generic/listctrl.cpp
View File

@@ -4581,7 +4581,7 @@ bool wxListCtrl::Create(wxWindow *parent,
style = style | wxLC_LIST; 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; return FALSE;
// don't create the inner window with the border // don't create the inner window with the border

14
src/x11/timer.cpp
View File

@@ -63,11 +63,11 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
if ( desc->running ) if ( desc->running )
return; // already scheduled return; // already scheduled
#pragma
#if 0
if ( when == 0 ) if ( when == 0 )
when = wxGetLocalTimeMillis() + desc->timer->GetInterval(); {
#endif unsigned long local = wxGetLocalTimeMillis().ToLong();
when = local + desc->timer->GetInterval();
}
desc->shotTime = when; desc->shotTime = when;
desc->running = TRUE; desc->running = TRUE;
@@ -109,11 +109,7 @@ void wxTimerScheduler::NotifyTimers()
{ {
bool oneShot; bool oneShot;
volatile bool timerDeleted; volatile bool timerDeleted;
#pragma unsigned long now = wxGetLocalTimeMillis().ToLong();
unsigned long now;
#if 0
now = wxGetLocalTimeMillis();
#endif
wxTimerDesc *desc; wxTimerDesc *desc;
while ( m_timers && m_timers->shotTime <= now ) while ( m_timers && m_timers->shotTime <= now )

2
src/x11/window.cpp
View File

@@ -933,7 +933,6 @@ void wxWindowX11::X11SendPaintEvents()
if (!GetEventHandler()->ProcessEvent(erase_event)) if (!GetEventHandler()->ProcessEvent(erase_event))
{ {
printf( "Hallo!\n" );
Window xwindow = (Window) GetMainWindow(); Window xwindow = (Window) GetMainWindow();
Display *xdisplay = wxGlobalDisplay(); Display *xdisplay = wxGlobalDisplay();
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL ); GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
@@ -946,6 +945,7 @@ void wxWindowX11::X11SendPaintEvents()
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++; upd ++;
} }
XFreeGC( xdisplay, xgc );
} }
m_clearRegion.Clear(); m_clearRegion.Clear();
} }