compilation fix (ooooops)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -413,9 +413,9 @@ static void draw_frame( GtkWidget *widget, wxWindow *win )
|
||||
gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
|
||||
{
|
||||
if (gdk_event->count > 0) return FALSE;
|
||||
|
||||
|
||||
draw_frame( widget, win );
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -648,7 +648,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
/*
|
||||
if (win->GetName() == wxT("panel"))
|
||||
{
|
||||
@@ -661,7 +661,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
(int)gdk_event->area.height );
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
win->GetUpdateRegion().Union( gdk_event->area.x,
|
||||
gdk_event->area.y,
|
||||
gdk_event->area.width,
|
||||
@@ -669,7 +669,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
if (gdk_event->count == 0)
|
||||
{
|
||||
wxClientDC dc(this);
|
||||
wxClientDC dc(win);
|
||||
wxEraseEvent eevent( win->GetId(), &dc );
|
||||
eevent.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent(eevent);
|
||||
@@ -680,14 +680,14 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
win->GetUpdateRegion().Clear();
|
||||
}
|
||||
|
||||
|
||||
/* The following code will result in all window-less widgets
|
||||
being redrawn if the wxWindows class is given a chance to
|
||||
paint *anything* because it will then be allowed to paint
|
||||
over the window-less widgets */
|
||||
|
||||
|
||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||
|
||||
|
||||
GList *children = pizza->children;
|
||||
while (children)
|
||||
{
|
||||
@@ -707,7 +707,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -745,7 +745,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
/*
|
||||
if (win->GetName() == wxT("panel"))
|
||||
{
|
||||
@@ -758,21 +758,21 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
(int)rect->height );
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||
|
||||
|
||||
if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
|
||||
(pizza->clear_on_draw))
|
||||
{
|
||||
gdk_window_clear_area( pizza->bin_window,
|
||||
rect->x, rect->y, rect->width, rect->height);
|
||||
}
|
||||
|
||||
|
||||
win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
|
||||
|
||||
win->m_clipPaintRegion = TRUE;
|
||||
|
||||
wxClientDC dc(this);
|
||||
|
||||
wxClientDC dc(win);
|
||||
wxEraseEvent eevent( win->GetId(), &dc );
|
||||
eevent.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent(eevent);
|
||||
@@ -782,10 +782,10 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
|
||||
win->GetUpdateRegion().Clear();
|
||||
|
||||
|
||||
win->m_clipPaintRegion = FALSE;
|
||||
|
||||
|
||||
|
||||
|
||||
GList *children = pizza->children;
|
||||
while (children)
|
||||
{
|
||||
@@ -1864,7 +1864,7 @@ gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
|
||||
wxWindowCreateEvent event( win );
|
||||
event.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -1961,22 +1961,22 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
|
||||
GdkIMStyle style;
|
||||
GdkIMStyle supported_style = (GdkIMStyle)
|
||||
(GDK_IM_PREEDIT_NONE |
|
||||
GDK_IM_PREEDIT_NOTHING |
|
||||
GDK_IM_PREEDIT_POSITION |
|
||||
GDK_IM_STATUS_NONE |
|
||||
GDK_IM_STATUS_NOTHING);
|
||||
GDK_IM_PREEDIT_NOTHING |
|
||||
GDK_IM_PREEDIT_POSITION |
|
||||
GDK_IM_STATUS_NONE |
|
||||
GDK_IM_STATUS_NOTHING);
|
||||
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
supported_style = (GdkIMStyle)(supported_style & ~GDK_IM_PREEDIT_POSITION);
|
||||
supported_style = (GdkIMStyle)(supported_style & ~GDK_IM_PREEDIT_POSITION);
|
||||
|
||||
attr->style = style = gdk_im_decide_style (supported_style);
|
||||
attr->client_window = widget->window;
|
||||
|
||||
if ((colormap = gtk_widget_get_colormap (widget)) !=
|
||||
gtk_widget_get_default_colormap ())
|
||||
gtk_widget_get_default_colormap ())
|
||||
{
|
||||
attrmask |= GDK_IC_PREEDIT_COLORMAP;
|
||||
attr->preedit_colormap = colormap;
|
||||
attrmask |= GDK_IC_PREEDIT_COLORMAP;
|
||||
attr->preedit_colormap = colormap;
|
||||
}
|
||||
|
||||
attrmask |= GDK_IC_PREEDIT_FOREGROUND;
|
||||
@@ -1986,40 +1986,40 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
|
||||
|
||||
switch (style & GDK_IM_PREEDIT_MASK)
|
||||
{
|
||||
case GDK_IM_PREEDIT_POSITION:
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
{
|
||||
g_warning ("over-the-spot style requires fontset");
|
||||
break;
|
||||
}
|
||||
case GDK_IM_PREEDIT_POSITION:
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
{
|
||||
g_warning ("over-the-spot style requires fontset");
|
||||
break;
|
||||
}
|
||||
|
||||
gdk_window_get_size (widget->window, &width, &height);
|
||||
gdk_window_get_size (widget->window, &width, &height);
|
||||
|
||||
attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
|
||||
attr->spot_location.x = 0;
|
||||
attr->spot_location.y = height;
|
||||
attr->preedit_area.x = 0;
|
||||
attr->preedit_area.y = 0;
|
||||
attr->preedit_area.width = width;
|
||||
attr->preedit_area.height = height;
|
||||
attr->preedit_fontset = widget->style->font;
|
||||
attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
|
||||
attr->spot_location.x = 0;
|
||||
attr->spot_location.y = height;
|
||||
attr->preedit_area.x = 0;
|
||||
attr->preedit_area.y = 0;
|
||||
attr->preedit_area.width = width;
|
||||
attr->preedit_area.height = height;
|
||||
attr->preedit_fontset = widget->style->font;
|
||||
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
|
||||
|
||||
if (win->m_ic == NULL)
|
||||
g_warning ("Can't create input context.");
|
||||
g_warning ("Can't create input context.");
|
||||
else
|
||||
{
|
||||
mask = gdk_window_get_events (widget->window);
|
||||
mask = (GdkEventMask)(mask | gdk_ic_get_events (win->m_ic));
|
||||
gdk_window_set_events (widget->window, mask);
|
||||
{
|
||||
mask = gdk_window_get_events (widget->window);
|
||||
mask = (GdkEventMask)(mask | gdk_ic_get_events (win->m_ic));
|
||||
gdk_window_set_events (widget->window, mask);
|
||||
|
||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||
gdk_im_begin (win->m_ic, widget->window);
|
||||
}
|
||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||
gdk_im_begin (win->m_ic, widget->window);
|
||||
}
|
||||
#endif
|
||||
|
||||
return FALSE;
|
||||
@@ -2114,7 +2114,7 @@ void wxWindow::Init()
|
||||
|
||||
m_delayedForegroundColour = FALSE;
|
||||
m_delayedBackgroundColour = FALSE;
|
||||
|
||||
|
||||
#ifdef HAVE_XIM
|
||||
m_ic = (GdkIC*) NULL;
|
||||
m_icattr = (GdkICAttr*) NULL;
|
||||
@@ -2147,7 +2147,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
|
||||
}
|
||||
|
||||
m_insertCallback = wxInsertChildInWindow;
|
||||
|
||||
|
||||
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
|
||||
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
|
||||
|
||||
@@ -2289,7 +2289,7 @@ wxWindow::~wxWindow()
|
||||
// don't delete if it's a pixmap theme style
|
||||
if (!m_widgetStyle->engine_data)
|
||||
gtk_style_unref( m_widgetStyle );
|
||||
#endif
|
||||
#endif
|
||||
m_widgetStyle = (GtkStyle*) NULL;
|
||||
}
|
||||
|
||||
@@ -2347,7 +2347,7 @@ void wxWindow::PostCreation()
|
||||
if (!m_noExpose)
|
||||
{
|
||||
/* these get reported to wxWindows -> wxPaintEvent */
|
||||
|
||||
|
||||
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
|
||||
@@ -2381,7 +2381,7 @@ void wxWindow::PostCreation()
|
||||
else
|
||||
{
|
||||
// For dialogs and frames, we are interested mainly in
|
||||
// m_widget's focus.
|
||||
// m_widget's focus.
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_widget), "focus_in_event",
|
||||
GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
|
||||
@@ -2462,7 +2462,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
|
||||
if (m_resizing) return; /* I don't like recursions */
|
||||
m_resizing = TRUE;
|
||||
|
||||
|
||||
if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
|
||||
{
|
||||
/* don't set the size for children of wxNotebook, just take the values. */
|
||||
@@ -2523,7 +2523,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
|
||||
if (m_hasScrolling)
|
||||
{
|
||||
/* Sometimes the client area changes size without the
|
||||
/* Sometimes the client area changes size without the
|
||||
whole windows's size changing, but if the whole
|
||||
windows's size doesn't change, no wxSizeEvent will
|
||||
normally be sent. Here we add an extra test if
|
||||
@@ -2995,7 +2995,7 @@ bool wxWindow::SetCursor( const wxCursor &cursor )
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
if (cursor == wxNullCursor)
|
||||
return wxWindowBase::SetCursor( *wxSTANDARD_CURSOR );
|
||||
else
|
||||
@@ -3266,7 +3266,7 @@ void wxWindow::SetWidgetStyle()
|
||||
style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
|
||||
style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
// Try to restore the gtk default style. This is still a little
|
||||
// oversimplified for what is probably really needed here for controls
|
||||
@@ -3303,7 +3303,7 @@ void wxWindow::SetWidgetStyle()
|
||||
// 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
|
||||
// button to wxSYS_COLOUR_BTNFACE will restore its usual highlighting
|
||||
// behavior -- RL
|
||||
GtkStyle *def = gtk_rc_get_style( m_widget );
|
||||
|
||||
@@ -3669,14 +3669,14 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
|
||||
|
||||
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
|
||||
|
||||
|
||||
if ((dx == 0) && (dy == 0)) return;
|
||||
|
||||
m_clipPaintRegion = TRUE;
|
||||
gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
|
||||
m_clipPaintRegion = FALSE;
|
||||
|
||||
/*
|
||||
|
||||
/*
|
||||
if (m_children.GetCount() > 0)
|
||||
{
|
||||
gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
|
||||
@@ -3684,10 +3684,10 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
else
|
||||
{
|
||||
GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
|
||||
|
||||
|
||||
pizza->xoffset -= dx;
|
||||
pizza->yoffset -= dy;
|
||||
|
||||
|
||||
GdkGC *m_scrollGC = gdk_gc_new( pizza->bin_window );
|
||||
gdk_gc_set_exposures( m_scrollGC, TRUE );
|
||||
|
||||
@@ -3700,7 +3700,7 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
if ((h < 0) || (w < 0))
|
||||
{
|
||||
Refresh();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int s_x = 0;
|
||||
@@ -3723,7 +3723,7 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
|
||||
Refresh( TRUE, &rect );
|
||||
}
|
||||
|
||||
|
||||
gdk_gc_unref( m_scrollGC );
|
||||
}
|
||||
*/
|
||||
|
@@ -413,9 +413,9 @@ static void draw_frame( GtkWidget *widget, wxWindow *win )
|
||||
gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
|
||||
{
|
||||
if (gdk_event->count > 0) return FALSE;
|
||||
|
||||
|
||||
draw_frame( widget, win );
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -648,7 +648,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
/*
|
||||
if (win->GetName() == wxT("panel"))
|
||||
{
|
||||
@@ -661,7 +661,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
(int)gdk_event->area.height );
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
win->GetUpdateRegion().Union( gdk_event->area.x,
|
||||
gdk_event->area.y,
|
||||
gdk_event->area.width,
|
||||
@@ -669,7 +669,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
if (gdk_event->count == 0)
|
||||
{
|
||||
wxClientDC dc(this);
|
||||
wxClientDC dc(win);
|
||||
wxEraseEvent eevent( win->GetId(), &dc );
|
||||
eevent.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent(eevent);
|
||||
@@ -680,14 +680,14 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
|
||||
win->GetUpdateRegion().Clear();
|
||||
}
|
||||
|
||||
|
||||
/* The following code will result in all window-less widgets
|
||||
being redrawn if the wxWindows class is given a chance to
|
||||
paint *anything* because it will then be allowed to paint
|
||||
over the window-less widgets */
|
||||
|
||||
|
||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||
|
||||
|
||||
GList *children = pizza->children;
|
||||
while (children)
|
||||
{
|
||||
@@ -707,7 +707,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
|
||||
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -745,7 +745,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
/*
|
||||
if (win->GetName() == wxT("panel"))
|
||||
{
|
||||
@@ -758,21 +758,21 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
(int)rect->height );
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||
|
||||
|
||||
if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
|
||||
(pizza->clear_on_draw))
|
||||
{
|
||||
gdk_window_clear_area( pizza->bin_window,
|
||||
rect->x, rect->y, rect->width, rect->height);
|
||||
}
|
||||
|
||||
|
||||
win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
|
||||
|
||||
win->m_clipPaintRegion = TRUE;
|
||||
|
||||
wxClientDC dc(this);
|
||||
|
||||
wxClientDC dc(win);
|
||||
wxEraseEvent eevent( win->GetId(), &dc );
|
||||
eevent.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent(eevent);
|
||||
@@ -782,10 +782,10 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
|
||||
win->GetUpdateRegion().Clear();
|
||||
|
||||
|
||||
win->m_clipPaintRegion = FALSE;
|
||||
|
||||
|
||||
|
||||
|
||||
GList *children = pizza->children;
|
||||
while (children)
|
||||
{
|
||||
@@ -1864,7 +1864,7 @@ gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
|
||||
wxWindowCreateEvent event( win );
|
||||
event.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -1961,22 +1961,22 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
|
||||
GdkIMStyle style;
|
||||
GdkIMStyle supported_style = (GdkIMStyle)
|
||||
(GDK_IM_PREEDIT_NONE |
|
||||
GDK_IM_PREEDIT_NOTHING |
|
||||
GDK_IM_PREEDIT_POSITION |
|
||||
GDK_IM_STATUS_NONE |
|
||||
GDK_IM_STATUS_NOTHING);
|
||||
GDK_IM_PREEDIT_NOTHING |
|
||||
GDK_IM_PREEDIT_POSITION |
|
||||
GDK_IM_STATUS_NONE |
|
||||
GDK_IM_STATUS_NOTHING);
|
||||
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
supported_style = (GdkIMStyle)(supported_style & ~GDK_IM_PREEDIT_POSITION);
|
||||
supported_style = (GdkIMStyle)(supported_style & ~GDK_IM_PREEDIT_POSITION);
|
||||
|
||||
attr->style = style = gdk_im_decide_style (supported_style);
|
||||
attr->client_window = widget->window;
|
||||
|
||||
if ((colormap = gtk_widget_get_colormap (widget)) !=
|
||||
gtk_widget_get_default_colormap ())
|
||||
gtk_widget_get_default_colormap ())
|
||||
{
|
||||
attrmask |= GDK_IC_PREEDIT_COLORMAP;
|
||||
attr->preedit_colormap = colormap;
|
||||
attrmask |= GDK_IC_PREEDIT_COLORMAP;
|
||||
attr->preedit_colormap = colormap;
|
||||
}
|
||||
|
||||
attrmask |= GDK_IC_PREEDIT_FOREGROUND;
|
||||
@@ -1986,40 +1986,40 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
|
||||
|
||||
switch (style & GDK_IM_PREEDIT_MASK)
|
||||
{
|
||||
case GDK_IM_PREEDIT_POSITION:
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
{
|
||||
g_warning ("over-the-spot style requires fontset");
|
||||
break;
|
||||
}
|
||||
case GDK_IM_PREEDIT_POSITION:
|
||||
if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
|
||||
{
|
||||
g_warning ("over-the-spot style requires fontset");
|
||||
break;
|
||||
}
|
||||
|
||||
gdk_window_get_size (widget->window, &width, &height);
|
||||
gdk_window_get_size (widget->window, &width, &height);
|
||||
|
||||
attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
|
||||
attr->spot_location.x = 0;
|
||||
attr->spot_location.y = height;
|
||||
attr->preedit_area.x = 0;
|
||||
attr->preedit_area.y = 0;
|
||||
attr->preedit_area.width = width;
|
||||
attr->preedit_area.height = height;
|
||||
attr->preedit_fontset = widget->style->font;
|
||||
attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
|
||||
attr->spot_location.x = 0;
|
||||
attr->spot_location.y = height;
|
||||
attr->preedit_area.x = 0;
|
||||
attr->preedit_area.y = 0;
|
||||
attr->preedit_area.width = width;
|
||||
attr->preedit_area.height = height;
|
||||
attr->preedit_fontset = widget->style->font;
|
||||
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
|
||||
|
||||
if (win->m_ic == NULL)
|
||||
g_warning ("Can't create input context.");
|
||||
g_warning ("Can't create input context.");
|
||||
else
|
||||
{
|
||||
mask = gdk_window_get_events (widget->window);
|
||||
mask = (GdkEventMask)(mask | gdk_ic_get_events (win->m_ic));
|
||||
gdk_window_set_events (widget->window, mask);
|
||||
{
|
||||
mask = gdk_window_get_events (widget->window);
|
||||
mask = (GdkEventMask)(mask | gdk_ic_get_events (win->m_ic));
|
||||
gdk_window_set_events (widget->window, mask);
|
||||
|
||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||
gdk_im_begin (win->m_ic, widget->window);
|
||||
}
|
||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||
gdk_im_begin (win->m_ic, widget->window);
|
||||
}
|
||||
#endif
|
||||
|
||||
return FALSE;
|
||||
@@ -2114,7 +2114,7 @@ void wxWindow::Init()
|
||||
|
||||
m_delayedForegroundColour = FALSE;
|
||||
m_delayedBackgroundColour = FALSE;
|
||||
|
||||
|
||||
#ifdef HAVE_XIM
|
||||
m_ic = (GdkIC*) NULL;
|
||||
m_icattr = (GdkICAttr*) NULL;
|
||||
@@ -2147,7 +2147,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
|
||||
}
|
||||
|
||||
m_insertCallback = wxInsertChildInWindow;
|
||||
|
||||
|
||||
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
|
||||
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
|
||||
|
||||
@@ -2289,7 +2289,7 @@ wxWindow::~wxWindow()
|
||||
// don't delete if it's a pixmap theme style
|
||||
if (!m_widgetStyle->engine_data)
|
||||
gtk_style_unref( m_widgetStyle );
|
||||
#endif
|
||||
#endif
|
||||
m_widgetStyle = (GtkStyle*) NULL;
|
||||
}
|
||||
|
||||
@@ -2347,7 +2347,7 @@ void wxWindow::PostCreation()
|
||||
if (!m_noExpose)
|
||||
{
|
||||
/* these get reported to wxWindows -> wxPaintEvent */
|
||||
|
||||
|
||||
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
|
||||
@@ -2381,7 +2381,7 @@ void wxWindow::PostCreation()
|
||||
else
|
||||
{
|
||||
// For dialogs and frames, we are interested mainly in
|
||||
// m_widget's focus.
|
||||
// m_widget's focus.
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_widget), "focus_in_event",
|
||||
GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
|
||||
@@ -2462,7 +2462,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
|
||||
if (m_resizing) return; /* I don't like recursions */
|
||||
m_resizing = TRUE;
|
||||
|
||||
|
||||
if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
|
||||
{
|
||||
/* don't set the size for children of wxNotebook, just take the values. */
|
||||
@@ -2523,7 +2523,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
|
||||
if (m_hasScrolling)
|
||||
{
|
||||
/* Sometimes the client area changes size without the
|
||||
/* Sometimes the client area changes size without the
|
||||
whole windows's size changing, but if the whole
|
||||
windows's size doesn't change, no wxSizeEvent will
|
||||
normally be sent. Here we add an extra test if
|
||||
@@ -2995,7 +2995,7 @@ bool wxWindow::SetCursor( const wxCursor &cursor )
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
|
||||
if (cursor == wxNullCursor)
|
||||
return wxWindowBase::SetCursor( *wxSTANDARD_CURSOR );
|
||||
else
|
||||
@@ -3266,7 +3266,7 @@ void wxWindow::SetWidgetStyle()
|
||||
style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
|
||||
style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
// Try to restore the gtk default style. This is still a little
|
||||
// oversimplified for what is probably really needed here for controls
|
||||
@@ -3303,7 +3303,7 @@ void wxWindow::SetWidgetStyle()
|
||||
// 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
|
||||
// button to wxSYS_COLOUR_BTNFACE will restore its usual highlighting
|
||||
// behavior -- RL
|
||||
GtkStyle *def = gtk_rc_get_style( m_widget );
|
||||
|
||||
@@ -3669,14 +3669,14 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
|
||||
|
||||
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
|
||||
|
||||
|
||||
if ((dx == 0) && (dy == 0)) return;
|
||||
|
||||
m_clipPaintRegion = TRUE;
|
||||
gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
|
||||
m_clipPaintRegion = FALSE;
|
||||
|
||||
/*
|
||||
|
||||
/*
|
||||
if (m_children.GetCount() > 0)
|
||||
{
|
||||
gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
|
||||
@@ -3684,10 +3684,10 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
else
|
||||
{
|
||||
GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
|
||||
|
||||
|
||||
pizza->xoffset -= dx;
|
||||
pizza->yoffset -= dy;
|
||||
|
||||
|
||||
GdkGC *m_scrollGC = gdk_gc_new( pizza->bin_window );
|
||||
gdk_gc_set_exposures( m_scrollGC, TRUE );
|
||||
|
||||
@@ -3700,7 +3700,7 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
if ((h < 0) || (w < 0))
|
||||
{
|
||||
Refresh();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int s_x = 0;
|
||||
@@ -3723,7 +3723,7 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
|
||||
|
||||
Refresh( TRUE, &rect );
|
||||
}
|
||||
|
||||
|
||||
gdk_gc_unref( m_scrollGC );
|
||||
}
|
||||
*/
|
||||
|
Reference in New Issue
Block a user