#include <gdk/gdkkeysyms-compat.h>
#endif
-#if !GTK_CHECK_VERSION(2,10,0)
- // GTK+ can reliably detect Meta key state only since 2.10 when
- // GDK_META_MASK was introduced -- there wasn't any way to detect it
- // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but
- // GDK_MOD2_MASK is documented as:
- //
- // the fifth modifier key (it depends on the modifier mapping of the X
- // server which key is interpreted as this modifier)
- //
- // In other words, it isn't guaranteed to map to Meta. This is a real
- // problem: it is common to map NumLock to it (in fact, it's an exception
- // if the X server _doesn't_ use it for NumLock). So the old code caused
- // wxKeyEvent::MetaDown() to always return true as long as NumLock was on
- // on many systems, which broke all applications using
- // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here:
- // http://tinyurl.com/56lsk2).
- //
- // Because of this, it's better to not detect Meta key state at all than
- // to detect it incorrectly. Hence the following #define, which causes
- // m_metaDown to be always set to false.
- #define GDK_META_MASK 0
-#endif
-
//-----------------------------------------------------------------------------
// documentation on internals
//-----------------------------------------------------------------------------
extern "C" {
static void
-parent_set(GtkWidget* widget, GtkObject* old_parent, wxWindow* win)
+parent_set(GtkWidget* widget, GtkWidget* old_parent, wxWindow* win)
{
if (old_parent)
{
//-----------------------------------------------------------------------------
static void
-gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindow* win)
+gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindowGTK* win)
{
win->GTKHandleRealized();
}
gtk_im_context_set_client_window(win->m_imData->context, NULL);
}
-void wxWindowGTK::GTKHandleRealized()
-{
- if (m_imData)
- {
- gtk_im_context_set_client_window
- (
- m_imData->context,
- m_wxwindow ? GTKGetDrawingWindow()
- : gtk_widget_get_window(m_widget)
- );
- }
-
- // We cannot set colours and fonts before the widget
- // been realized, so we do this directly after realization
- // or otherwise in idle time
-
- if (m_needsStyleChange)
- {
- SetBackgroundStyle(GetBackgroundStyle());
- m_needsStyleChange = false;
- }
-
- wxWindowCreateEvent event( this );
- event.SetEventObject( this );
- GTKProcessEvent( event );
-
- GTKUpdateCursor(true, false);
-}
-
//-----------------------------------------------------------------------------
// "size_allocate" from m_wxwindow or m_widget
//-----------------------------------------------------------------------------
} // extern "C"
+void wxWindowGTK::GTKHandleRealized()
+{
+ if (m_imData)
+ {
+ gtk_im_context_set_client_window
+ (
+ m_imData->context,
+ m_wxwindow ? GTKGetDrawingWindow()
+ : gtk_widget_get_window(m_widget)
+ );
+ }
+
+ // We cannot set colours and fonts before the widget
+ // been realized, so we do this directly after realization
+ // or otherwise in idle time
+
+ if (m_needsStyleChange)
+ {
+ SetBackgroundStyle(GetBackgroundStyle());
+ m_needsStyleChange = false;
+ }
+
+ wxWindowCreateEvent event(static_cast<wxWindow*>(this));
+ event.SetEventObject( this );
+ GTKProcessEvent( event );
+
+ GTKUpdateCursor(true, false);
+}
+
// ----------------------------------------------------------------------------
// this wxWindowBase function is implemented here (in platform-specific file)
// because it is static and so couldn't be made virtual
gtk_widget_show( m_widget );
}
-unsigned long wxWindowGTK::GTKConnectWidget(const char *signal, void (*callback)())
+unsigned long
+wxWindowGTK::GTKConnectWidget(const char *signal, wxGTKCallback callback)
{
return g_signal_connect(m_widget, signal, callback, this);
}
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x = currentX;
- if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y = currentY;
+ if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0 && (x == -1 || y == -1))
+ {
+ int currentX, currentY;
+ GetPosition(¤tX, ¤tY);
+ if (x == -1)
+ x = currentX;
+ if (y == -1)
+ y = currentY;
+ }
AdjustForParentClientOrigin(x, y, sizeFlags);
// calculate the best size if we should auto size the window
void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect)
{
- if ( !m_widget )
- {
- // it is valid to call Refresh() for a window which hasn't been created
- // yet, it simply doesn't do anything in this case
+ if (m_widget == NULL || !gtk_widget_get_mapped(m_widget))
return;
- }
- if (!m_wxwindow)
- {
- if (rect)
- gtk_widget_queue_draw_area( m_widget, rect->x, rect->y, rect->width, rect->height );
- else
- gtk_widget_queue_draw( m_widget );
- }
- else
+ if (m_wxwindow)
{
- // Just return if the widget or one of its ancestors isn't mapped
- GtkWidget *w;
- for (w = m_wxwindow; w != NULL; w = gtk_widget_get_parent(w))
- if (!gtk_widget_get_mapped (w))
- return;
-
- GdkWindow* window = GTKGetDrawingWindow();
+ GdkWindow* window = gtk_widget_get_window(m_wxwindow);
if (rect)
{
- int x = rect->x;
+ GdkRectangle r = { rect->x, rect->y, rect->width, rect->height };
if (GetLayoutDirection() == wxLayout_RightToLeft)
- x = GetClientSize().x - x - rect->width;
- GdkRectangle r;
- r.x = rect->x;
- r.y = rect->y;
- r.width = rect->width;
- r.height = rect->height;
+ r.x = gdk_window_get_width(window) - r.x - rect->width;
gdk_window_invalidate_rect(window, &r, true);
}
else
gdk_window_invalidate_rect(window, NULL, true);
}
+ else
+ {
+ if (rect)
+ gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height);
+ else
+ gtk_widget_queue_draw(m_widget);
+ }
}
void wxWindowGTK::Update()
projects / wxWidgets.git / blobdiff