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

Removed the new flicker code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-02 10:24:26 +00:00
parent 3db7be8036
commit 7b67869804
5 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/event.cpp
View File

@@ -371,16 +371,8 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
int i = 0; int i = 0;
int commandId = event.GetId(); int commandId = event.GetId();
while (table.entries[i].m_fn != while (table.entries[i].m_fn)
#ifdef __SGI_CC__
0L
#else
NULL
#endif
)
{ {
// wxEventType eventType = (wxEventType) table.entries[i].m_eventType;
if ((event.GetEventType() == table.entries[i].m_eventType) && if ((event.GetEventType() == table.entries[i].m_eventType) &&
(table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1) (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
(table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) || (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||
@@ -431,8 +423,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
{ {
wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
// wxEventType eventType = (wxEventType) entry->m_eventType;
if (entry->m_fn) if (entry->m_fn)
{ {
if ((event.GetEventType() == entry->m_eventType) && if ((event.GetEventType() == entry->m_eventType) &&
@@ -451,7 +441,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
else else
return TRUE; return TRUE;
} }
}; }
node = node->Next(); node = node->Next();
} }
return FALSE; return FALSE;

2
src/gtk/dcclient.cpp
View File

@@ -116,6 +116,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC(); SetUpDC();
/*
wxRegion update = window->GetUpdateRegion(); wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return; if (update.Empty()) return;
@@ -123,6 +124,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() ); gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() ); gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() ); gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
} }
wxWindowDC::~wxWindowDC(void) wxWindowDC::~wxWindowDC(void)

5
src/gtk/window.cpp
View File

@@ -1533,9 +1533,6 @@ void wxWindow::GetClientSize( int *width, int *height ) const
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar;
if ((m_windowStyle & wxRAISED_BORDER) || if ((m_windowStyle & wxRAISED_BORDER) ||
(m_windowStyle & wxSUNKEN_BORDER)) (m_windowStyle & wxSUNKEN_BORDER))
{ {
@@ -1692,7 +1689,7 @@ void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSE
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
//if (GetAutoLayout()) Layout(); if (GetAutoLayout()) Layout();
} }
bool wxWindow::Show( bool show ) bool wxWindow::Show( bool show )

2
src/gtk1/dcclient.cpp
View File

@@ -116,6 +116,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC(); SetUpDC();
/*
wxRegion update = window->GetUpdateRegion(); wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return; if (update.Empty()) return;
@@ -123,6 +124,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() ); gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() ); gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() ); gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
} }
wxWindowDC::~wxWindowDC(void) wxWindowDC::~wxWindowDC(void)

5
src/gtk1/window.cpp
View File

@@ -1533,9 +1533,6 @@ void wxWindow::GetClientSize( int *width, int *height ) const
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar;
if ((m_windowStyle & wxRAISED_BORDER) || if ((m_windowStyle & wxRAISED_BORDER) ||
(m_windowStyle & wxSUNKEN_BORDER)) (m_windowStyle & wxSUNKEN_BORDER))
{ {
@@ -1692,7 +1689,7 @@ void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSE
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
//if (GetAutoLayout()) Layout(); if (GetAutoLayout()) Layout();
} }
bool wxWindow::Show( bool show ) bool wxWindow::Show( bool show )