/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "window.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#ifdef __VMS
#define XWarpPointer XWARPPOINTER
#endif
-#include "wx/defs.h"
#include "wx/window.h"
#include "wx/dcclient.h"
#include "wx/frame.h"
#include "wx/gtk/win_gtk.h"
+#ifdef __WXGTK20__
+#include <pango/pangox.h>
+#endif
+
#ifdef __WXGTK20__
#define SET_CONTAINER_FOCUS(w, d) gtk_widget_child_focus((w), (d))
#else
/*
I have been asked several times about writing some documentation about
- the GTK port of wxWindows, especially its internal structures. Obviously,
+ the GTK port of wxWidgets, especially its internal structures. Obviously,
you cannot understand wxGTK without knowing a little about the GTK, but
some more information about what the wxWindow, which is the base class
for all other window classes, does seems required as well.
6) Display a border (sunken, raised, simple or none).
- Normally one might expect, that one wxWindows window would always correspond
+ Normally one might expect, that one wxWidgets window would always correspond
to one GTK widget. Under GTK, there is no such allround widget that has all
the functionality. Moreover, the GTK defines a client area as a different
widget from the actual widget you are handling. Last but not least some
special classes (e.g. wxFrame) handle different categories of widgets and
still have the possibility to draw something in the client area.
It was therefore required to write a special purpose GTK widget, that would
- represent a client area in the sense of wxWindows capable to do the jobs
+ represent a client area in the sense of wxWidgets capable to do the jobs
2), 3) and 4). I have written this class and it resides in win_gtk.c of
this directory.
one is (in the GTK sense) a child of the GtkScrolledWindow.
If the m_wxwindow field is set, then all input to this widget is inter-
- cepted and sent to the wxWindows class. If not, all input to the widget
+ cepted and sent to the wxWidgets class. If not, all input to the widget
that gets pointed to by m_widget gets intercepted and sent to the class.
II)
- The design of scrolling in wxWindows is markedly different from that offered
+ The design of scrolling in wxWidgets is markedly different from that offered
by the GTK itself and therefore we cannot simply take it as it is. In GTK,
clicking on a scrollbar belonging to scrolled window will inevitably move
- the window. In wxWindows, the scrollbar will only emit an event, send this
+ the window. In wxWidgets, the scrollbar will only emit an event, send this
to (normally) a wxScrolledWindow and that class will call ScrollWindow()
which actually moves the window and its subchildren. Note that GtkPizza
- memorizes how much it has been scrolled but that wxWindows forgets this
+ memorizes how much it has been scrolled but that wxWidgets forgets this
so that the two coordinates systems have to be kept in synch. This is done
in various places using the pizza->xoffset and pizza->yoffset values.
// send any activate events at all
static int g_sendActivateEvent = -1;
-/* hack: we need something to pass to gtk_menu_popup, so we store the time of
- the last click here */
-static guint32 gs_timeLastClick = 0;
+// hack: we need something to pass to gtk_menu_popup, so we store the time of
+// the last click here
+static guint32 gs_timeLastClick = 0;
extern bool g_mainThreadLocked;
// debug
//-----------------------------------------------------------------------------
-#ifndef __WXGTK20__
-#define DISABLE_STYLE_IF_BROKEN_THEME 1
-#endif
-
#ifdef __WXDEBUG__
#if wxUSE_THREADS
if ( winFocus == win )
return (wxWindow *)win;
- for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
+ for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
node;
node = node->GetNext() )
{
// "size_request" of m_widget
//-----------------------------------------------------------------------------
-static void gtk_window_size_request_callback( GtkWidget *widget, GtkRequisition *requisition, wxWindow *win )
+// make it extern because wxStatitText needs to disconnect this one
+extern "C"
+void wxgtk_window_size_request_callback(GtkWidget *widget,
+ GtkRequisition *requisition,
+ wxWindow *win)
{
- int w,h;
+ int w, h;
win->GetSize( &w, &h );
- if (w < 2) w = 2;
- if (h < 2) h = 2;
+ if (w < 2)
+ w = 2;
+ if (h < 2)
+ h = 2;
requisition->height = h;
requisition->width = w;
// This callback gets called in drawing-idle time under
// GTK 2.0, so we don't need to defer anything to idle
// time anymore.
-
+
GtkPizza *pizza = GTK_PIZZA( widget );
if (gdk_event->window != pizza->bin_window) return FALSE;
-
+
#if 0
if (win->GetName())
{
(int)gdk_event->area.width,
(int)gdk_event->area.height );
}
+
+ gtk_paint_box
+ (
+ win->m_wxwindow->style,
+ pizza->bin_window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ (GdkRectangle*) NULL,
+ win->m_wxwindow,
+ (char *)"button", // const_cast
+ 20,20,24,24
+ );
#endif
win->GetUpdateRegion() = wxRegion( gdk_event->region );
win->GtkSendPaintEvents();
+
// Let parent window draw window less widgets
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
#else
// This gets called immediately after an expose event
// under GTK 1.2 so we collect the calls and wait for
// the idle handler to pick things up.
-
+
win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
gdk_event->area.width,
if (g_isIdle)
wxapp_install_idle_handler();
- // The wxNO_FULL_REPAINT_ON_RESIZE flag only works if
- // there are no child windows.
- if ((win->HasFlag(wxNO_FULL_REPAINT_ON_RESIZE)) &&
- (win->GetChildren().GetCount() == 0))
+ // if there are any children we must refresh everything
+ //
+ // VZ: why?
+ if ( !win->HasFlag(wxFULL_REPAINT_ON_RESIZE) &&
+ win->GetChildren().IsEmpty() )
{
return;
}
return TRUE;
}
+
static gint gtk_window_key_press_callback( GtkWidget *widget,
GdkEventKey *gdk_event,
wxWindow *win )
// will only be sent if it is not in an accelerator table.
if (!ret)
{
- // Find key code for EVT_CHAR and EVT_CHAR_HOOK events
+ long key_code;
KeySym keysym = gdk_event->keyval;
- long key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */);
- if ( !key_code )
+#ifdef __WXGTK20__
+ // In GTK 2.0, we need to hand over the key event to an input method
+ // and the IM will emit a "commit" event containing the actual utf8
+ // character. In that case the EVT_CHAR events will be sent from
+ // there. But only do it this way for non-KeySym keys.
+ key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */);
+ if ( !key_code && win->m_imContext )
{
- if ( gdk_event->length == 1 )
- {
- key_code = (unsigned char)gdk_event->string[0];
- }
- else if ( wxIsAsciiKeysym(keysym) )
- {
- // ASCII key
- key_code = (unsigned char)keysym;
- }
+ gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event );
+ ret = TRUE;
}
-
- if ( key_code )
+ else
+#endif
{
- wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code);
-
- event.m_keyCode = key_code;
-
- // Implement OnCharHook by checking ancesteror top level windows
- wxWindow *parent = win;
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
- if (parent)
+ // Find key code for EVT_CHAR and EVT_CHAR_HOOK events
+ key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */);
+ if ( !key_code )
{
- event.SetEventType( wxEVT_CHAR_HOOK );
- ret = parent->GetEventHandler()->ProcessEvent( event );
+ if ( gdk_event->length == 1 )
+ {
+ key_code = (unsigned char)gdk_event->string[0];
+ }
+ else if ( wxIsAsciiKeysym(keysym) )
+ {
+ // ASCII key
+ key_code = (unsigned char)keysym;
+ }
}
- if (!ret)
+ if ( key_code )
{
- event.SetEventType(wxEVT_CHAR);
- ret = win->GetEventHandler()->ProcessEvent( event );
+ wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code);
+
+ event.m_keyCode = key_code;
+
+ // Implement OnCharHook by checking ancesteror top level windows
+ wxWindow *parent = win;
+ while (parent && !parent->IsTopLevel())
+ parent = parent->GetParent();
+ if (parent)
+ {
+ event.SetEventType( wxEVT_CHAR_HOOK );
+ ret = parent->GetEventHandler()->ProcessEvent( event );
+ }
+
+ if (!ret)
+ {
+ event.SetEventType(wxEVT_CHAR);
+ ret = win->GetEventHandler()->ProcessEvent( event );
+ }
}
}
}
if ( !ret &&
(gdk_event->keyval == GDK_Escape) )
{
- wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
- new_event.SetEventObject( win );
- ret = win->GetEventHandler()->ProcessEvent( new_event );
- }
-
- // Doesn't work.
-#if 0
- // Pressing F10 will activate the menu bar of the top frame
- if ( (!ret) &&
- (gdk_event->keyval == GDK_F10) )
- {
- wxWindowGTK *ancestor = win;
- while (ancestor)
+ // however only do it if we have a Cancel button in the dialog,
+ // otherwise the user code may get confused by the events from a
+ // non-existing button and, worse, a wxButton might get button event
+ // from another button which is not really expected
+ wxWindow *winForCancel = win,
+ *btnCancel = NULL;
+ while ( winForCancel )
{
- if (wxIsKindOf(ancestor,wxFrame))
+ btnCancel = winForCancel->FindWindow(wxID_CANCEL);
+ if ( btnCancel )
{
- wxFrame *frame = (wxFrame*) ancestor;
- wxMenuBar *menubar = frame->GetMenuBar();
- if (menubar)
- {
- wxNode *node = menubar->GetMenus().First();
- if (node)
- {
- wxMenu *firstMenu = (wxMenu*) node->Data();
- gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
- ret = TRUE;
- break;
- }
- }
+ // found a cancel button
+ break;
}
- ancestor = ancestor->GetParent();
+
+ if ( winForCancel->IsTopLevel() )
+ {
+ // no need to look further
+ break;
+ }
+
+ // maybe our parent has a cancel button?
+ winForCancel = winForCancel->GetParent();
+ }
+
+ if ( btnCancel )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+ event.SetEventObject(btnCancel);
+ ret = btnCancel->GetEventHandler()->ProcessEvent(event);
}
}
-#endif // 0
if (ret)
{
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
return TRUE;
}
-
+
return FALSE;
}
+#ifdef __WXGTK20__
+static void gtk_wxwindow_commit_cb (GtkIMContext *context,
+ const gchar *str,
+ wxWindow *window)
+{
+ bool ret = FALSE;
+
+ wxKeyEvent event( wxEVT_KEY_DOWN );
+
+#if wxUSE_UNICODE
+ event.m_uniChar = g_utf8_get_char( str );
+
+ // Backward compatible for ISO-8859
+ if (event.m_uniChar < 256)
+ event.m_keyCode = event.m_uniChar;
+#else
+ gunichar uniChar = g_utf8_get_char( str );
+ // We cannot handle Unicode in non-Unicode mode
+ if (uniChar > 255) return;
+
+ event.m_keyCode = uniChar;
+#endif
+
+
+ // TODO: We still need to set all the extra attributes of the
+ // event, modifiers and such...
+
+
+ // Implement OnCharHook by checking ancestor top level windows
+ wxWindow *parent = window;
+ while (parent && !parent->IsTopLevel())
+ parent = parent->GetParent();
+ if (parent)
+ {
+ event.SetEventType( wxEVT_CHAR_HOOK );
+ ret = parent->GetEventHandler()->ProcessEvent( event );
+ }
+
+ if (!ret)
+ {
+ event.SetEventType(wxEVT_CHAR);
+ ret = window->GetEventHandler()->ProcessEvent( event );
+ }
+}
+#endif
+
+
//-----------------------------------------------------------------------------
// "key_release_event" from any window
//-----------------------------------------------------------------------------
// mouse event processing helpers
// ----------------------------------------------------------------------------
-// init wxMouseEvent with the info from gdk_event
-//
-// NB: this has to be a macro as gdk_event type is different for different
-// events we're used with
-#define InitMouseEvent(/* wxWindowGTK * */ win, \
- /* wxMouseEvent& */ event, \
- /* GdkEventXXX * */ gdk_event) \
-{ \
- event.SetTimestamp( gdk_event->time ); \
- event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); \
- event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK); \
- event.m_altDown = (gdk_event->state & GDK_MOD1_MASK); \
- event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); \
- event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); \
- event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); \
- event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); \
- \
- wxPoint pt = win->GetClientAreaOrigin(); \
- event.m_x = (wxCoord)gdk_event->x - pt.x; \
- event.m_y = (wxCoord)gdk_event->y - pt.y; \
- \
- event.SetEventObject( win ); \
- event.SetId( win->GetId() ); \
- event.SetTimestamp( gdk_event->time ); \
-} \
+// init wxMouseEvent with the info from GdkEventXXX struct
+template<typename T> void InitMouseEvent(wxWindowGTK *win,
+ wxMouseEvent& event,
+ T *gdk_event)
+{
+ event.SetTimestamp( gdk_event->time );
+ event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
+ event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
+ event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
+ event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
+ event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
+ event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
+ event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
+ if (event.GetEventType() == wxEVT_MOUSEWHEEL)
+ {
+ event.m_linesPerAction = 3;
+ if (((GdkEventButton*)gdk_event)->button == 4)
+ event.m_wheelRotation = 120;
+ else if (((GdkEventButton*)gdk_event)->button == 5)
+ event.m_wheelRotation = -120;
+ }
+
+ wxPoint pt = win->GetClientAreaOrigin();
+ event.m_x = (wxCoord)gdk_event->x - pt.x;
+ event.m_y = (wxCoord)gdk_event->y - pt.y;
+
+ event.SetEventObject( win );
+ event.SetId( win->GetId() );
+ event.SetTimestamp( gdk_event->time );
+}
static void AdjustEventButtonState(wxMouseEvent& event)
{
yy += pizza->yoffset;
}
- wxNode *node = win->GetChildren().First();
+ wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
while (node)
{
- wxWindowGTK *child = (wxWindowGTK*)node->Data();
+ wxWindowGTK *child = node->GetData();
- node = node->Next();
+ node = node->GetNext();
if (!child->IsShown())
continue;
int xx1 = child->m_x;
int yy1 = child->m_y;
int xx2 = child->m_x + child->m_width;
- int yy2 = child->m_x + child->m_height;
+ int yy2 = child->m_y + child->m_height;
// left
if (((xx >= xx1) && (xx <= xx1+10) && (yy >= yy1) && (yy <= yy2)) ||
*/
}
+ // GDK sends surplus button down event
+ // before a double click event. We
+ // need to filter these out.
+ if (gdk_event->type == GDK_BUTTON_PRESS)
+ {
+ GdkEvent *peek_event = gdk_event_peek();
+ if (peek_event)
+ {
+ if ((peek_event->type == GDK_2BUTTON_PRESS) ||
+ (peek_event->type == GDK_3BUTTON_PRESS))
+ {
+ gdk_event_free( peek_event );
+ return TRUE;
+ }
+ else
+ {
+ gdk_event_free( peek_event );
+ }
+ }
+ }
+
wxEventType event_type = wxEVT_NULL;
+ // GdkDisplay is a GTK+ 2.1.0 thing
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
+ if ( gdk_event->type == GDK_2BUTTON_PRESS &&
+ gdk_event->button >= 1 && gdk_event->button <= 3 )
+ {
+ // Reset GDK internal timestamp variables in order to disable GDK
+ // triple click events. GDK will then next time believe no button has
+ // been clicked just before, and send a normal button click event.
+ GdkDisplay* display = gtk_widget_get_display (widget);
+ display->button_click_time[1] = 0;
+ display->button_click_time[0] = 0;
+ }
+#endif // GTK 2+
+
if (gdk_event->button == 1)
{
+ // note that GDK generates triple click events which are not supported
+ // by wxWidgets but still have to be passed to the app as otherwise
+ // clicks would simply go missing
switch (gdk_event->type)
{
- case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; break;
- case GDK_2BUTTON_PRESS: event_type = wxEVT_LEFT_DCLICK; break;
- default: break;
+ // we shouldn't get triple clicks at all for GTK2 because we
+ // suppress them artificially using the code above but we still
+ // should map them to something for GTK1 and not just ignore them
+ // as this would lose clicks
+ case GDK_3BUTTON_PRESS: // we could also map this to DCLICK...
+ case GDK_BUTTON_PRESS:
+ event_type = wxEVT_LEFT_DOWN;
+ break;
+
+ case GDK_2BUTTON_PRESS:
+ event_type = wxEVT_LEFT_DCLICK;
+ break;
+
+ default:
+ // just to silence gcc warnings
+ ;
}
}
else if (gdk_event->button == 2)
{
switch (gdk_event->type)
{
- case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break;
- case GDK_2BUTTON_PRESS: event_type = wxEVT_MIDDLE_DCLICK; break;
- default: break;
+ case GDK_3BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
+ event_type = wxEVT_MIDDLE_DOWN;
+ break;
+
+ case GDK_2BUTTON_PRESS:
+ event_type = wxEVT_MIDDLE_DCLICK;
+ break;
+
+ default:
+ ;
}
}
else if (gdk_event->button == 3)
{
switch (gdk_event->type)
{
- case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break;
- case GDK_2BUTTON_PRESS: event_type = wxEVT_RIGHT_DCLICK; break;
- default: break;
+ case GDK_3BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
+ event_type = wxEVT_RIGHT_DOWN;
+ break;
+
+ case GDK_2BUTTON_PRESS:
+ event_type = wxEVT_RIGHT_DCLICK;
+ break;
+
+ default:
+ ;
+ }
+ }
+ else if (gdk_event->button == 4 || gdk_event->button == 5)
+ {
+ if (gdk_event->type == GDK_BUTTON_PRESS )
+ {
+ event_type = wxEVT_MOUSEWHEEL;
}
}
wxPrintf( wxT(".\n") );
*/
+#ifndef __WXGTK20__
+ if (event_type == wxEVT_LEFT_DCLICK)
+ {
+ // GTK 1.2 crashes when intercepting double
+ // click events from both wxSpinButton and
+ // wxSpinCtrl
+ if (GTK_IS_SPIN_BUTTON(win->m_widget))
+ {
+ // Just disable this event for now.
+ return FALSE;
+ }
+ }
+#endif
+
if (win->GetEventHandler()->ProcessEvent( event ))
{
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
// "button_release_event"
//-----------------------------------------------------------------------------
-static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindowGTK *win )
+static gint gtk_window_button_release_callback( GtkWidget *widget,
+ GdkEventButton *gdk_event,
+ wxWindowGTK *win )
{
DEBUG_MAIN_THREAD
if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
-/*
- printf( "OnButtonRelease from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
-
wxEventType event_type = wxEVT_NULL;
switch (gdk_event->button)
{
- case 1: event_type = wxEVT_LEFT_UP; break;
- case 2: event_type = wxEVT_MIDDLE_UP; break;
- case 3: event_type = wxEVT_RIGHT_UP; break;
- default: return FALSE;
+ case 1:
+ event_type = wxEVT_LEFT_UP;
+ break;
+
+ case 2:
+ event_type = wxEVT_MIDDLE_UP;
+ break;
+
+ case 3:
+ event_type = wxEVT_RIGHT_UP;
+ break;
+
+ default:
+ // unknwon button, don't process
+ return FALSE;
}
wxMouseEvent event( event_type );
// same wxListBox hack as above
win->FixUpMouseEvent(widget, event.m_x, event.m_y);
+ if ( event_type == wxEVT_RIGHT_UP )
+ {
+ // generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
+ // except that:
+ //
+ // (a) it's a command event and so is propagated to the parent
+ // (b) under MSW it can be generated from kbd too
+ // (c) it uses screen coords (because of (a))
+ wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
+ win->GetId(),
+ win->ClientToScreen(event.GetPosition()));
+ (void)win->GetEventHandler()->ProcessEvent(evtCtx);
+ }
+
if ( !g_captureWindow )
win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
{
// synthetize a mouse enter or leave event if needed
GdkWindow *winUnderMouse = gdk_window_at_pointer(NULL, NULL);
+ // This seems to be necessary and actually been added to
+ // GDK itself in version 2.0.X
+ gdk_flush();
+
bool hasMouse = winUnderMouse == gdk_event->window;
if ( hasMouse != g_captureWindowHasMouse )
{
return FALSE;
}
+#ifdef __WXGTK20__
+//-----------------------------------------------------------------------------
+// "mouse_wheel_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_wheel_callback (GtkWidget * widget,
+ GdkEventScroll * gdk_event,
+ wxWindowGTK * win)
+{
+ DEBUG_MAIN_THREAD
+
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ wxEventType event_type = wxEVT_NULL;
+ if (gdk_event->direction == GDK_SCROLL_UP)
+ event_type = wxEVT_MOUSEWHEEL;
+ else if (gdk_event->direction == GDK_SCROLL_DOWN)
+ event_type = wxEVT_MOUSEWHEEL;
+ else
+ return FALSE;
+
+ wxMouseEvent event( event_type );
+ // Can't use InitMouse macro because scroll events don't have button
+ event.SetTimestamp( gdk_event->time );
+ event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
+ event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
+ event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
+ event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
+ event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
+ event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
+ event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
+ event.m_linesPerAction = 3;
+ if (gdk_event->direction == GDK_SCROLL_UP)
+ event.m_wheelRotation = 120;
+ else
+ event.m_wheelRotation = -120;
+
+ wxPoint pt = win->GetClientAreaOrigin();
+ event.m_x = (wxCoord)gdk_event->x - pt.x;
+ event.m_y = (wxCoord)gdk_event->y - pt.y;
+
+ event.SetEventObject( win );
+ event.SetId( win->GetId() );
+ event.SetTimestamp( gdk_event->time );
+
+ if (win->GetEventHandler()->ProcessEvent( event ))
+ {
+ gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "scroll_event" );
+ return TRUE;
+ }
+
+ return FALSE;
+}
+#endif
+
//-----------------------------------------------------------------------------
// "focus_in_event"
//-----------------------------------------------------------------------------
#endif // wxUSE_CARET
g_activeFrameLostFocus = FALSE;
-
+
wxWindowGTK *active = wxGetTopLevelParent(win);
if ( active != g_activeFrame )
{
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
-
+
// Don't send focus events in addition to activate
// if (win == g_activeFrame)
// return TRUE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
+ // Event was emitted after a grab
+ if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE;
+
if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
int x = 0;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
+ // Event was emitted after an ungrab
+ if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE;
+
if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
wxMouseEvent event( wxEVT_LEAVE_WINDOW );
return (wxWindow *)g_focusWindow;
}
-//-----------------------------------------------------------------------------
-// "destroy" event
-//-----------------------------------------------------------------------------
-
-// VZ: Robert commented the code using out so it generates warnings: should
-// be either fixed or removed completely
-#if 0
-
-static void gtk_window_destroy_callback( GtkWidget* widget, wxWindow *win )
-{
- wxWindowDestroyEvent event(win);
- win->GetEventHandler()->ProcessEvent(event);
-}
-
-#endif // 0
//-----------------------------------------------------------------------------
// "realize" from m_widget
been realized, so we do this directly after realization. */
static gint
-gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
+gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win )
{
DEBUG_MAIN_THREAD
if (g_isIdle)
wxapp_install_idle_handler();
-
- if (win->m_delayedBackgroundColour)
+
+ if (win->m_delayedBackgroundColour && !win->GetThemeEnabled())
win->GtkSetBackgroundColour( win->GetBackgroundColour() );
- if (win->m_delayedForegroundColour)
+ if (win->m_delayedForegroundColour && !win->GetThemeEnabled())
win->GtkSetForegroundColour( win->GetForegroundColour() );
+#ifdef __WXGTK20__
+ if (win->m_imContext)
+ {
+ GtkPizza *pizza = GTK_PIZZA( m_widget );
+ gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window );
+ }
+#endif
+
wxWindowCreateEvent event( win );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
void wxWindowGTK::Init()
{
- // common init
- InitBase();
-
// GTK specific
m_widget = (GtkWidget *) NULL;
m_wxwindow = (GtkWidget *) NULL;
m_hAdjust = (GtkAdjustment*) NULL;
m_vAdjust = (GtkAdjustment*) NULL;
- m_oldHorizontalPos = 0.0;
+ m_oldHorizontalPos =
m_oldVerticalPos = 0.0;
+ m_oldClientWidth =
+ m_oldClientHeight = 0;
m_resizing = FALSE;
- m_widgetStyle = (GtkStyle*) NULL;
m_insertCallback = (wxInsertChildFunction) NULL;
m_delayedForegroundColour = FALSE;
m_delayedBackgroundColour = FALSE;
+#ifdef __WXGTK20__
+ m_imContext = NULL;
+ m_x11Context = NULL;
+#else
#ifdef HAVE_XIM
m_ic = (GdkIC*) NULL;
m_icattr = (GdkICAttr*) NULL;
#endif
+#endif
}
wxWindowGTK::wxWindowGTK()
}
m_insertCallback = wxInsertChildInWindow;
-
+
// always needed for background clearing
- m_delayedBackgroundColour = TRUE;
+ m_delayedBackgroundColour = TRUE;
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
// these handlers block mouse events to any window during scrolling such as
- // motion events and prevent GTK and wxWindows from fighting over where the
+ // motion events and prevent GTK and wxWidgets from fighting over where the
// slider should be
gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
+#ifdef __WXGTK20__
+ // Create input method handler
+ m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new ();
+
+ // Cannot handle drawing preedited text yet
+ gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE );
+
+ g_signal_connect (G_OBJECT (m_imContext), "commit",
+ G_CALLBACK (gtk_wxwindow_commit_cb), this);
+#endif
+
gtk_widget_show( m_wxwindow );
if (m_parent)
PostCreation();
- Show( TRUE );
-
return TRUE;
}
wxWindowGTK::~wxWindowGTK()
{
+ SendDestroyEvent();
+
if (g_focusWindow == this)
g_focusWindow = NULL;
DestroyChildren();
- if (m_parent)
- m_parent->RemoveChild( this );
-
#ifdef HAVE_XIM
if (m_ic)
gdk_ic_destroy (m_ic);
gdk_ic_attr_destroy (m_icattr);
#endif
- if (m_widgetStyle)
- {
-#if DISABLE_STYLE_IF_BROKEN_THEME
- // don't delete if it's a pixmap theme style
- if (!m_widgetStyle->engine_data)
- gtk_style_unref( m_widgetStyle );
-#endif
- m_widgetStyle = (GtkStyle*) NULL;
- }
-
if (m_wxwindow)
{
gtk_widget_destroy( m_wxwindow );
{
wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") );
- // This turns -1 into 30 so that a minimal window is
- // visible even although -1,-1 has been given as the
- // size of the window. the same trick is used in other
- // ports and should make debugging easier.
+ // Use either the given size, or the default if -1 is given.
+ // See wxWindowBase for these functions.
m_width = WidthDefault(size.x) ;
m_height = HeightDefault(size.y);
m_x = (int)pos.x;
m_y = (int)pos.y;
- // some reasonable defaults
- if (!parent)
- {
- if (m_x == -1)
- {
- m_x = (gdk_screen_width () - m_width) / 2;
- if (m_x < 10) m_x = 10;
- }
- if (m_y == -1)
- {
- m_y = (gdk_screen_height () - m_height) / 2;
- if (m_y < 10) m_y = 10;
- }
- }
-
return TRUE;
}
{
if (!m_noExpose)
{
- // these get reported to wxWindows -> wxPaintEvent
+ // these get reported to wxWidgets -> wxPaintEvent
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
- if (HasFlag(wxNO_FULL_REPAINT_ON_RESIZE))
+ if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
{
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
}
#else
- gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ) );
+ // gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) );
+#endif
+
+#ifdef __WXGTK20__
+ // Create input method handler
+ m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new ();
+
+ // Cannot handle drawing preedited text yet
+ gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE );
+
+ g_signal_connect (G_OBJECT (m_imContext), "commit",
+ G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif
}
GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this );
}
- if (!GTK_IS_COMBO(m_widget))
+ if ( !GTK_IS_COMBO(m_widget))
{
// This is needed if we want to add our windows into native
// GTK control, such as the toolbar. With this callback, the
// programmer). Sadly, it misbehaves for wxComboBox. FIXME
// when moving to GTK 2.0.
gtk_signal_connect( GTK_OBJECT(m_widget), "size_request",
- GTK_SIGNAL_FUNC(gtk_window_size_request_callback), (gpointer) this );
+ GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
+ (gpointer) this );
}
m_hasVMT = TRUE;
+
+ // unless the window was created initially hidden (i.e. Hide() had been
+ // called before Create()), we should show it at GTK+ level as well
+ if ( IsShown() )
+ gtk_widget_show( m_widget );
}
void wxWindowGTK::ConnectWidget( GtkWidget *widget )
gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
+#ifdef __WXGTK20__
+ gtk_signal_connect( GTK_OBJECT(widget), "scroll_event",
+ GTK_SIGNAL_FUNC(gtk_window_wheel_callback), (gpointer)this );
+#endif
+
gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event",
GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
-
- // This keeps crashing on me. RR.
- //
- // gtk_signal_connect( GTK_OBJECT(widget), "destroy",
- // GTK_SIGNAL_FUNC(gtk_window_destroy_callback), (gpointer)this );
}
bool wxWindowGTK::Destroy()
int currentX, currentY;
GetPosition(¤tX, ¤tY);
- if (x == -1)
+ if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x = currentX;
- if (y == -1)
+ if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y = currentY;
AdjustForParentClientOrigin(x, y, sizeFlags);
m_x = x + pizza->xoffset;
m_y = y + pizza->yoffset;
}
- if (width != -1) m_width = width;
- if (height != -1) m_height = height;
- if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+ // calculate the best size if we should auto size the window
+ if ( ((sizeFlags & wxSIZE_AUTO_WIDTH) && width == -1) ||
+ ((sizeFlags & wxSIZE_AUTO_HEIGHT) && height == -1) )
{
- if (width == -1) m_width = 80;
+ const wxSize sizeBest = GetBestSize();
+ if ( (sizeFlags & wxSIZE_AUTO_WIDTH) && width == -1 )
+ width = sizeBest.x;
+ if ( (sizeFlags & wxSIZE_AUTO_HEIGHT) && height == -1 )
+ height = sizeBest.y;
}
- if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
- {
- if (height == -1) m_height = 26;
- }
+ if (width != -1)
+ m_width = width;
+ if (height != -1)
+ m_height = height;
int minWidth = GetMinWidth(),
minHeight = GetMinHeight(),
}
g_activeFrameLostFocus = FALSE;
}
-
+
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
void wxWindowGTK::DoGetSize( int *width, int *height ) const
else
gtk_widget_hide( m_widget );
+ wxShowEvent eventShow(GetId(), show);
+ eventShow.m_eventObject = this;
+
+ GetEventHandler()->ProcessEvent(eventShow);
+
return TRUE;
}
// Recurse, so that children have the opportunity to Do The Right Thing
// and reset colours that have been messed up by a parent's (really ancestor's)
// Enable call
- for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
+ for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
node;
node = node->GetNext() )
{
{
wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
- wxCHECK_MSG( m_font.Ok(), 12, wxT("invalid font") );
+ wxFont font = GetFont();
+ wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );
+
+#ifdef __WXGTK20__
+ PangoContext *context = NULL;
+ if (m_widget)
+ context = gtk_widget_get_pango_context( m_widget );
+
+ if (!context)
+ return 0;
+
+ PangoFontDescription *desc = font.GetNativeFontInfo()->description;
+ PangoLayout *layout = pango_layout_new(context);
+ pango_layout_set_font_description(layout, desc);
+ pango_layout_set_text(layout, "H", 1);
+ PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+
+ PangoRectangle rect;
+ pango_layout_line_get_extents(line, NULL, &rect);
+
+ g_object_unref( G_OBJECT( layout ) );
- GdkFont *font = m_font.GetInternalFont( 1.0 );
+ return (int) (rect.height / PANGO_SCALE);
+#else
+ GdkFont *gfont = font.GetInternalFont( 1.0 );
- return font->ascent + font->descent;
+ return gfont->ascent + gfont->descent;
+#endif
}
int wxWindowGTK::GetCharWidth() const
{
wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
- wxCHECK_MSG( m_font.Ok(), 8, wxT("invalid font") );
+ wxFont font = GetFont();
+ wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );
+
+#ifdef __WXGTK20__
+ PangoContext *context = NULL;
+ if (m_widget)
+ context = gtk_widget_get_pango_context( m_widget );
+
+ if (!context)
+ return 0;
- GdkFont *font = m_font.GetInternalFont( 1.0 );
+ PangoFontDescription *desc = font.GetNativeFontInfo()->description;
+ PangoLayout *layout = pango_layout_new(context);
+ pango_layout_set_font_description(layout, desc);
+ pango_layout_set_text(layout, "g", 1);
+ PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
- return gdk_string_width( font, "H" );
+ PangoRectangle rect;
+ pango_layout_line_get_extents(line, NULL, &rect);
+
+ g_object_unref( G_OBJECT( layout ) );
+
+ return (int) (rect.width / PANGO_SCALE);
+#else
+ GdkFont *gfont = font.GetInternalFont( 1.0 );
+
+ return gdk_string_width( gfont, "g" );
+#endif
}
void wxWindowGTK::GetTextExtent( const wxString& string,
int *externalLeading,
const wxFont *theFont ) const
{
- wxFont fontToUse = m_font;
- if (theFont) fontToUse = *theFont;
+ wxFont fontToUse = theFont ? *theFont : GetFont();
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
-
+
if (string.IsEmpty())
{
if (x) (*x) = 0;
if (y) (*y) = 0;
return;
}
-#ifdef __WXGTK20__
+#ifdef __WXGTK20__
PangoContext *context = NULL;
if (m_widget)
- gtk_widget_get_pango_context( m_widget );
-
+ context = gtk_widget_get_pango_context( m_widget );
+
if (!context)
{
if (x) (*x) = 0;
if (y) (*y) = 0;
return;
}
-
+
PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
PangoLayout *layout = pango_layout_new(context);
pango_layout_set_font_description(layout, desc);
#endif
}
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
-
+
PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect);
-
+
if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
if (descent)
(*descent) = 0;
}
if (externalLeading) (*externalLeading) = 0; // ??
-
+
g_object_unref( G_OBJECT( layout ) );
#else
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
{
if (!m_widget) return;
if (!m_widget->window) return;
-
+
#ifndef __WXGTK20__
if (g_isIdle)
wxapp_install_idle_handler();
-
+
+ wxRect myRect(0,0,0,0);
+ if (m_wxwindow && rect)
+ {
+ myRect.SetSize(wxSize( m_wxwindow->allocation.width,
+ m_wxwindow->allocation.height));
+ myRect.Intersect(*rect);
+ if (!myRect.width || !myRect.height)
+ // nothing to do, rectangle is empty
+ return;
+ rect = &myRect;
+ }
+
if (eraseBackground && m_wxwindow && m_wxwindow->window)
{
if (rect)
{
if (!m_wxwindow)
{
-#ifndef __WXGTK20__
+#ifndef __WXGTK20__
m_clearRegion.Clear();
#endif
m_updateRegion.Clear();
// Clip to paint region in wxClientDC
m_clipPaintRegion = TRUE;
-#ifndef __WXGTK20__
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
-
- // later for GTK 2.0, too.
+
if (GetThemeEnabled())
{
// find ancestor from which to steal background
parent = parent->GetParent();
if (!parent)
parent = (wxWindow*)this;
-
+
wxRegionIterator upd( m_updateRegion );
while (upd)
{
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
-
+
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
- GTK_STATE_NORMAL,
+ (GtkStateType)GTK_WIDGET_STATE(m_wxwindow),
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
-
+
upd ++;
}
}
else
-#endif
#ifdef __WXGTK20__
{
g_eraseGC = gdk_gc_new( pizza->bin_window );
gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
}
- gdk_gc_set_foreground( g_eraseGC, m_backgroundColour.GetColor() );
+ gdk_gc_set_foreground( g_eraseGC, GetBackgroundColour().GetColor() );
wxRegionIterator upd( m_clearRegion );
while (upd)
#ifndef __WXUNIVERSAL__
#ifndef __WXGTK20__
// The following code will result in all window-less widgets
- // being redrawn because the wxWindows class is allowed to
+ // being redrawn because the wxWidgets class is allowed to
// paint over the window-less widgets.
GList *children = pizza->children;
{
GtkPizzaChild *child = (GtkPizzaChild*) children->data;
children = children->next;
-
+
if (GTK_WIDGET_NO_WINDOW (child->widget) &&
GTK_WIDGET_DRAWABLE (child->widget))
{
m_updateRegion.Clear();
}
-void wxWindowGTK::Clear()
+void wxWindowGTK::ClearBackground()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
m_clearRegion.Clear();
wxSize size( GetClientSize() );
m_clearRegion.Union( 0,0,size.x,size.y );
-
+
// Better do this in idle?
GtkUpdate();
}
void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
{
- gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+ wxString tmp( tip );
+ gtk_tooltips_set_tip( tips, GetConnectWidget(), wxGTK_CONV(tmp), (gchar*) NULL );
}
#endif // wxUSE_TOOLTIPS
window = GetConnectWidget()->window;
wxASSERT( window );
-
+
// We need the pixel value e.g. for background clearing.
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-
+
if (m_wxwindow)
{
// wxMSW doesn't clear the window here, either.
return TRUE;
}
-GtkStyle *wxWindowGTK::GetWidgetStyle()
+#ifdef __WXGTK20__
+PangoContext *wxWindowGTK::GtkGetPangoDefaultContext()
{
- if (m_widgetStyle)
- {
- GtkStyle *remake = gtk_style_copy( m_widgetStyle );
-
- // FIXME: no more klass in 2.0
-#ifndef __WXGTK20__
- remake->klass = m_widgetStyle->klass;
-#endif
-
- gtk_style_unref( m_widgetStyle );
- m_widgetStyle = remake;
- }
- else
- {
- GtkStyle *def = gtk_rc_get_style( m_widget );
-
- if (!def)
- def = gtk_widget_get_default_style();
-
- m_widgetStyle = gtk_style_copy( def );
+ return gtk_widget_get_pango_context( m_widget );
+}
- // FIXME: no more klass in 2.0
-#ifndef __WXGTK20__
- m_widgetStyle->klass = def->klass;
-#endif
- }
+PangoContext *wxWindowGTK::GtkGetPangoX11Context()
+{
+ if (!m_x11Context)
+ m_x11Context = pango_x_get_context( gdk_display );
- return m_widgetStyle;
+ return m_x11Context;
}
-
-void wxWindowGTK::SetWidgetStyle()
+#endif
+
+GtkRcStyle *wxWindowGTK::CreateWidgetStyle()
{
-#if DISABLE_STYLE_IF_BROKEN_THEME
- if (m_widget->style->engine_data)
+ // do we need to apply any changes at all?
+ if ( !m_hasFont && !m_hasFgCol &&
+ (!m_hasBgCol || !m_backgroundColour.Ok()) )
{
- static bool s_warningPrinted = FALSE;
- if (!s_warningPrinted)
- {
- printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" );
- s_warningPrinted = TRUE;
- }
- m_widgetStyle = m_widget->style;
- return;
+ return NULL;
}
-#endif
- GtkStyle *style = GetWidgetStyle();
+ GtkRcStyle *style = gtk_rc_style_new();
- if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
+ if ( m_hasFont )
{
- SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 ));
+#ifdef __WXGTK20__
+ style->font_desc =
+ pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+#else
+ wxString xfontname = m_font.GetNativeFontInfo()->GetXFontName();
+ style->fontset_name = g_strdup(xfontname.c_str());
+#endif
}
- if (m_foregroundColour.Ok())
+ if ( m_hasFgCol )
{
m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT))
- {
- style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
- }
- else
- {
- // Try to restore the gtk default style. This is still a little
- // oversimplified for what is probably really needed here for controls
- // other than buttons, but is better than not being able to (re)set a
- // control's foreground colour to *wxBLACK -- RL
- GtkStyle *def = gtk_rc_get_style( m_widget );
-
- if (!def)
- def = gtk_widget_get_default_style();
-
- style->fg[GTK_STATE_NORMAL] = def->fg[GTK_STATE_NORMAL];
- style->fg[GTK_STATE_PRELIGHT] = def->fg[GTK_STATE_PRELIGHT];
- style->fg[GTK_STATE_ACTIVE] = def->fg[GTK_STATE_ACTIVE];
- }
+
+ style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
+ style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG;
+
+ style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
+ style->color_flags[GTK_STATE_PRELIGHT] = GTK_RC_FG;
+
+ style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
+ style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG;
}
- if (m_backgroundColour.Ok())
+ if ( m_hasBgCol && m_backgroundColour.Ok() )
{
m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))
- {
- style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- }
- else
- {
- // Try to restore the gtk default style. This is still a little
- // oversimplified for what is probably really needed here for controls
- // other than buttons, but is better than not being able to (re)set a
- // control's background colour to default grey and means resetting a
- // button to wxSYS_COLOUR_BTNFACE will restore its usual highlighting
- // behavior -- RL
- GtkStyle *def = gtk_rc_get_style( m_widget );
-
- if (!def)
- def = gtk_widget_get_default_style();
-
- style->bg[GTK_STATE_NORMAL] = def->bg[GTK_STATE_NORMAL];
- style->base[GTK_STATE_NORMAL] = def->base[GTK_STATE_NORMAL];
- style->bg[GTK_STATE_PRELIGHT] = def->bg[GTK_STATE_PRELIGHT];
- style->base[GTK_STATE_PRELIGHT] = def->base[GTK_STATE_PRELIGHT];
- style->bg[GTK_STATE_ACTIVE] = def->bg[GTK_STATE_ACTIVE];
- style->base[GTK_STATE_ACTIVE] = def->base[GTK_STATE_ACTIVE];
- style->bg[GTK_STATE_INSENSITIVE] = def->bg[GTK_STATE_INSENSITIVE];
- style->base[GTK_STATE_INSENSITIVE] = def->base[GTK_STATE_INSENSITIVE];
- }
+
+ style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->color_flags[GTK_STATE_NORMAL] = (GtkRcFlags)
+ (style->color_flags[GTK_STATE_NORMAL] | GTK_RC_BG | GTK_RC_BASE);
+
+ style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags)
+ (style->color_flags[GTK_STATE_PRELIGHT] | GTK_RC_BG | GTK_RC_BASE);
+
+ style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->color_flags[GTK_STATE_ACTIVE] = (GtkRcFlags)
+ (style->color_flags[GTK_STATE_ACTIVE] | GTK_RC_BG | GTK_RC_BASE);
+
+ style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ style->color_flags[GTK_STATE_INSENSITIVE] = (GtkRcFlags)
+ (style->color_flags[GTK_STATE_INSENSITIVE] | GTK_RC_BG | GTK_RC_BASE);
}
+
+ return style;
}
void wxWindowGTK::ApplyWidgetStyle()
static void SetInvokingWindow( wxMenu *menu, wxWindowGTK *win )
{
menu->SetInvokingWindow( win );
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
}
}
-// used to pass the coordinates from wxWindowGTK::DoPopupMenu() to
-// wxPopupMenuPositionCallback()
-//
-// should be safe even in the MT case as the user can hardly popup 2 menus
-// simultaneously, can he?
-static gint gs_pop_x = 0;
-static gint gs_pop_y = 0;
-
extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
gint *x, gint *y,
#ifdef __WXGTK20__
gboolean * WXUNUSED(whatever),
#endif
- gpointer WXUNUSED(user_data) )
+ gpointer user_data )
{
// ensure that the menu appears entirely on screen
GtkRequisition req;
gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
wxSize sizeScreen = wxGetDisplaySize();
+ wxPoint *pos = (wxPoint*)user_data;
gint xmax = sizeScreen.x - req.width,
ymax = sizeScreen.y - req.height;
- *x = gs_pop_x < xmax ? gs_pop_x : xmax;
- *y = gs_pop_y < ymax ? gs_pop_y : ymax;
+ *x = pos->x < xmax ? pos->x : xmax;
+ *y = pos->y < ymax ? pos->y : ymax;
}
bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
- wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
+ wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
SetInvokingWindow( menu, this );
menu->UpdateUI();
- gs_pop_x = x;
- gs_pop_y = y;
- ClientToScreen( &gs_pop_x, &gs_pop_y );
-
- bool is_waiting = TRUE;
+ bool is_waiting = true;
gtk_signal_connect( GTK_OBJECT(menu->m_menu),
"hide",
GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
(gpointer)&is_waiting );
+ wxPoint pos;
+ gpointer userdata;
+ GtkMenuPositionFunc posfunc;
+ if ( x == -1 && y == -1 )
+ {
+ // use GTK's default positioning algorithm
+ userdata = NULL;
+ posfunc = NULL;
+ }
+ else
+ {
+ pos = ClientToScreen(wxPoint(x, y));
+ userdata = &pos;
+ posfunc = wxPopupMenuPositionCallback;
+ }
+
gtk_menu_popup(
GTK_MENU(menu->m_menu),
(GtkWidget *) NULL, // parent menu shell
(GtkWidget *) NULL, // parent menu item
- wxPopupMenuPositionCallback, // function to position it
- NULL, // client data
+ posfunc, // function to position it
+ userdata, // client data
0, // button used to activate it
+#ifdef __WXGTK20__
+ gtk_get_current_event_time()
+#else
gs_timeLastClick // the time of activation
+#endif
);
while (is_waiting)
{
- while (gtk_events_pending())
- gtk_main_iteration();
+ gtk_main_iteration();
}
- return TRUE;
+ return true;
}
#endif // wxUSE_MENUS_NATIVE
bool wxWindowGTK::SetFont( const wxFont &font )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
-
- if (!wxWindowBase::SetFont(font))
+ if (!wxWindowBase::SetFont(font) || !m_widget)
{
return FALSE;
}
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
-
+
// No scrolling requested.
if ((dx == 0) && (dy == 0)) return;
int x, y;
GdkWindow* windowAtPtr = gdk_window_at_pointer(& x, & y);
- if (!windowAtPtr)
- return wxPoint(-999, -999);
- Display *display = GDK_WINDOW_XDISPLAY(windowAtPtr);
+ Display *display = windowAtPtr ? GDK_WINDOW_XDISPLAY(windowAtPtr) : GDK_DISPLAY();
Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
Window rootReturn, childReturn;
int rootX, rootY, winX, winY;
projects / wxWidgets.git / blobdiff