// "size_request" of m_widget
//-----------------------------------------------------------------------------
-// make it extern because wxStaticText needs to disconnect this one
extern "C" {
-void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
- GtkRequisition *requisition,
- wxWindow * win)
+static void
+wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
+ GtkRequisition *requisition,
+ wxWindow * win)
{
int w, h;
win->GetSize( &w, &h );
{
// Get default border
wxBorder border = GetBorder(style);
-
+
style &= ~wxBORDER_MASK;
style |= border;
#endif
- m_wxwindow = wxPizza::New(m_windowStyle);
+ m_wxwindow = wxPizza::New(m_windowStyle,this);
#ifndef __WXUNIVERSAL__
if (HasFlag(wxPizza::BORDER_STYLES))
{
event.SetEventObject( this );
HandleWindowEvent( event );
}
+ } else
+ if (sizeFlags & wxSIZE_FORCE_EVENT)
+ {
+ wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+ event.SetEventObject( this );
+ HandleWindowEvent( event );
}
}
continue;
}
- GtkScrolledWindowClass *scroll_class =
+ GtkScrolledWindowClass *scroll_class =
GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
GtkRequisition req;
void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect)
{
- if (!m_widget)
+ GtkWidget* widget;
+ if (m_wxwindow)
+ widget = m_wxwindow;
+ else if (m_widget)
+ widget = m_widget;
+ else
return;
- if (!m_widget->window)
+
+ if (!widget->window)
return;
- if (m_wxwindow)
+ if (rect == NULL)
+ gtk_widget_queue_draw(widget);
+ else
{
- if (m_wxwindow->window == NULL) return;
-
- GdkRectangle gdk_rect,
- *p;
- if (rect)
- {
- gdk_rect.x = rect->x;
- gdk_rect.y = rect->y;
- gdk_rect.width = rect->width;
- gdk_rect.height = rect->height;
- if (GetLayoutDirection() == wxLayout_RightToLeft)
- gdk_rect.x = GetClientSize().x - gdk_rect.x - gdk_rect.width;
-
- p = &gdk_rect;
- }
- else // invalidate everything
- {
- p = NULL;
- }
+ int x = rect->x;
+ if (GetLayoutDirection() == wxLayout_RightToLeft)
+ x = GetClientSize().x - x - rect->width;
- gdk_window_invalidate_rect(m_wxwindow->window, p, true);
+#if 0
+ gtk_widget_queue_draw_area(widget, x, rect->y, rect->width, rect->height);
+#else
+ GdkRectangle r;
+ r.x = rect->x;
+ r.y = rect->y;
+ r.width = rect->width;
+ r.height = rect->height;
+ gdk_window_invalidate_rect( m_wxwindow->window, &r, TRUE );
+#endif
}
}
void wxWindowGTK::Update()
{
- GtkUpdate();
-
- // when we call Update() we really want to update the window immediately on
- // screen, even if it means flushing the entire queue and hence slowing down
- // everything -- but it should still be done, it's just that Update() should
- // be called very rarely
- gdk_flush();
-}
+ if (m_widget && m_widget->window)
+ {
+ GdkDisplay* display = gtk_widget_get_display(m_widget);
+ // Flush everything out to the server, and wait for it to finish.
+ // This ensures nothing will overwrite the drawing we are about to do.
+ gdk_display_sync(display);
-void wxWindowGTK::GtkUpdate()
-{
- if (m_wxwindow && m_wxwindow->window)
- gdk_window_process_updates(m_wxwindow->window, false);
- if (m_widget && m_widget->window && (m_wxwindow != m_widget))
- gdk_window_process_updates( m_widget->window, FALSE );
+ gdk_window_process_updates(m_widget->window, true);
- // for consistency with other platforms (and also because it's convenient
- // to be able to update an entire TLW by calling Update() only once), we
- // should also update all our children here
- for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
- {
- node->GetData()->GtkUpdate();
+ // Flush again, but no need to wait for it to finish
+ gdk_display_flush(display);
}
}
return m_updateRegion.Contains(x, y) != wxOutRegion;
}
-
bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const
{
if (GetLayoutDirection() == wxLayout_RightToLeft)
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
- return int(sb->adjustment->page_size);
+ return wxRound(sb->adjustment->page_size);
}
int wxWindowGTK::GetScrollPos( int orient ) const
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
- return int(sb->adjustment->value + 0.5);
+ return wxRound(sb->adjustment->value);
}
int wxWindowGTK::GetScrollRange( int orient ) const
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
- return int(sb->adjustment->upper);
+ return wxRound(sb->adjustment->upper);
}
// Determine if increment is the same as +/-x, allowing for some small
const int barIndex = range == m_scrollBar[1];
GtkAdjustment* adj = range->adjustment;
- const int value = int(adj->value + 0.5);
+ const int value = wxRound(adj->value);
// save previous position
const double oldPos = m_scrollPos[barIndex];
// update current position
m_scrollPos[barIndex] = adj->value;
// If event should be ignored, or integral position has not changed
- if (!m_hasVMT || g_blockEventsOnDrag || value == int(oldPos + 0.5))
+ if (!m_hasVMT || g_blockEventsOnDrag || value == wxRound(oldPos))
{
return wxEVT_NULL;
}
projects / wxWidgets.git / blobdiff