From: Robert Roebling <robert@roebling.de>
Date: Wed, 29 Dec 1999 21:03:36 +0000 (+0000)
Subject:   IsExposed() corrections in calendar.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15807266c61a2e820c3a15c0701159c58b003af3

  IsExposed() corrections in calendar.


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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index b1a43f47e1..5419de38ce 100644
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -354,13 +354,13 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& event)
     for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow )
     {
         // if the update region doesn't intersect this row, don't paint it
-        if ( !IsExposed(0, y, 7*m_widthCol, y + m_heightRow - 1) )
+        if ( !IsExposed(0, y, 7*m_widthCol, m_heightRow - 1) )
         {
             date += wxDateSpan::Week();
 
             continue;
         }
-
+        
         printf("painting week %d at y = %d\n", nWeek, y);
 
         for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index c7281b8230..6759913bbc 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -598,9 +598,6 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
                                   gdk_event->area.width,
                                   gdk_event->area.height );
 
-    if (gdk_event->count > 0)
-        return;
-
 /*
     wxPrintf( "OnExpose from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
@@ -611,6 +608,9 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
                                 (int)gdk_event->area.height );
 */
 
+    if (gdk_event->count > 0)
+        return;
+
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index c7281b8230..6759913bbc 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -598,9 +598,6 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
                                   gdk_event->area.width,
                                   gdk_event->area.height );
 
-    if (gdk_event->count > 0)
-        return;
-
 /*
     wxPrintf( "OnExpose from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
@@ -611,6 +608,9 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
                                 (int)gdk_event->area.height );
 */
 
+    if (gdk_event->count > 0)
+        return;
+
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);