Removed the new flicker code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/event.cpp b/src/common/event.cpp
index c84e70f38c194b5439d31e1fdff53c961052a3ec..11d0de9e5146d89876bb49e05beb872ed4aced8f 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -370,17 +370,9 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 {
   int i = 0;
   int commandId = event.GetId();
-  
-  while (table.entries[i].m_fn != 
-#ifdef __SGI_CC__
-                                                               0L
-#else
-                                                               NULL
-#endif
-               )
-  {
-//    wxEventType eventType = (wxEventType) table.entries[i].m_eventType;
 
+  while (table.entries[i].m_fn)
+  {
     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_lastId == -1 && commandId == table.entries[i].m_id) ||
@@ -431,8 +423,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     
-//    wxEventType eventType = (wxEventType) entry->m_eventType;
-  
     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&
@@ -451,7 +441,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
       else
             return TRUE;
        }
-    };
+    }
     node = node->Next();
   }
   return FALSE;

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 421da6660e1caf55183dc09f397f0a7741ba7012..a0a0ec25450e93b2a1c77f3ea021678f0f5bb063 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -116,6 +116,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
         
     SetUpDC();
     
+/*
     wxRegion update = window->GetUpdateRegion();
     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_textGC, update.GetRegion() );
     gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
+*/
 }
 
 wxWindowDC::~wxWindowDC(void)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8a6093a34fc5230c8e78e6f1606871b4b4726157..69c55e6c43865d8118dcd65c4a023a2f57d9aaf8 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1533,9 +1533,6 @@ void wxWindow::GetClientSize( int *width, int *height ) const
 
       GtkStyleClass *viewport_class = viewport->style->klass;
 
-      GtkWidget *hscrollbar = scroll_window->hscrollbar;
-      GtkWidget *vscrollbar = scroll_window->vscrollbar;
-
       if ((m_windowStyle & wxRAISED_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) )
 {
-  //if (GetAutoLayout()) Layout();
+  if (GetAutoLayout()) Layout();
 }
 
 bool wxWindow::Show( bool show )

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 421da6660e1caf55183dc09f397f0a7741ba7012..a0a0ec25450e93b2a1c77f3ea021678f0f5bb063 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -116,6 +116,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
         
     SetUpDC();
     
+/*
     wxRegion update = window->GetUpdateRegion();
     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_textGC, update.GetRegion() );
     gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
+*/
 }
 
 wxWindowDC::~wxWindowDC(void)

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 8a6093a34fc5230c8e78e6f1606871b4b4726157..69c55e6c43865d8118dcd65c4a023a2f57d9aaf8 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1533,9 +1533,6 @@ void wxWindow::GetClientSize( int *width, int *height ) const
 
       GtkStyleClass *viewport_class = viewport->style->klass;
 
-      GtkWidget *hscrollbar = scroll_window->hscrollbar;
-      GtkWidget *vscrollbar = scroll_window->vscrollbar;
-
       if ((m_windowStyle & wxRAISED_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) )
 {
-  //if (GetAutoLayout()) Layout();
+  if (GetAutoLayout()) Layout();
 }
 
 bool wxWindow::Show( bool show )