typedef struct _GtkMyFixed GtkMyFixed;
typedef struct _GtkMyFixedClass GtkMyFixedClass;
-typedef struct _GtkMyFixedChild GtkMyFixedChild;
struct _GtkMyFixed
{
GtkContainer container;
GList *children;
-#if (GTK_MINOR_VERSION > 0)
GtkMyShadowType shadow_type;
-#endif
+
+ guint width;
+ guint height;
+
+ guint xoffset;
+ guint yoffset;
+
+ GdkWindow *bin_window;
+
+ GdkVisibilityState visibility;
+ gulong configure_serial;
+ gint scroll_x;
+ gint scroll_y;
};
struct _GtkMyFixedClass
{
GtkContainerClass parent_class;
-#if (GTK_MINOR_VERSION > 0)
void (*set_scroll_adjustments) (GtkMyFixed *myfixed,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-#endif
-};
-
-struct _GtkMyFixedChild
-{
- GtkWidget *widget;
- gint16 x;
- gint16 y;
- gint16 width;
- gint16 height;
};
guint gtk_myfixed_get_type (void);
GtkWidget* gtk_myfixed_new (void);
-#if (GTK_MINOR_VERSION > 0)
void gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
GtkMyShadowType type);
-#endif
+
+void gtk_myfixed_scroll (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy);
+
void gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
void gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y );
+ gint x,
+ gint y );
void gtk_myfixed_resize (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 width,
- gint16 height );
+ gint width,
+ gint height );
void gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
#ifdef __cplusplus
}
#endif /* __cplusplus */
typedef struct _GtkMyFixed GtkMyFixed;
typedef struct _GtkMyFixedClass GtkMyFixedClass;
-typedef struct _GtkMyFixedChild GtkMyFixedChild;
struct _GtkMyFixed
{
GtkContainer container;
GList *children;
-#if (GTK_MINOR_VERSION > 0)
GtkMyShadowType shadow_type;
-#endif
+
+ guint width;
+ guint height;
+
+ guint xoffset;
+ guint yoffset;
+
+ GdkWindow *bin_window;
+
+ GdkVisibilityState visibility;
+ gulong configure_serial;
+ gint scroll_x;
+ gint scroll_y;
};
struct _GtkMyFixedClass
{
GtkContainerClass parent_class;
-#if (GTK_MINOR_VERSION > 0)
void (*set_scroll_adjustments) (GtkMyFixed *myfixed,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-#endif
-};
-
-struct _GtkMyFixedChild
-{
- GtkWidget *widget;
- gint16 x;
- gint16 y;
- gint16 width;
- gint16 height;
};
guint gtk_myfixed_get_type (void);
GtkWidget* gtk_myfixed_new (void);
-#if (GTK_MINOR_VERSION > 0)
void gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
GtkMyShadowType type);
-#endif
+
+void gtk_myfixed_scroll (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy);
+
void gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
void gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y );
+ gint x,
+ gint y );
void gtk_myfixed_resize (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 width,
- gint16 height );
+ gint width,
+ gint height );
void gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
#ifdef __cplusplus
}
#endif /* __cplusplus */
!wxWindows/include/wx/qt !wxWindows/include/wx/stubs !wxWindows/include/wx/unix \
wxWindows/include/wx/generic wxWindows/include/wx/os2 wxWindows/include/wx/protocol
wxWindows/include/wx/html \
- wxWindows/src !wxWindows/src/Makefile !wxWindows/src/Makefile.in !wxWindows/src/gdk_implib \
+ wxWindows/src !wxWindows/src/Makefile !wxWindows/src/Makefile.in \
!wxWindows/src/mac !wxWindows/src/motif !wxWindows/src/msw !wxWindows/src/png \
!wxWindows/src/qt !wxWindows/src/stubs !wxWindows/src/unix !wxWindows/src/zlib \
!wxWindows/src/iodbc
#include "wx/image.h"
#include "wx/listctrl.h"
+#include "wx/sizer.h"
+#include "wx/log.h"
+
// derived classes
MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
~MyCanvas();
void OnPaint( wxPaintEvent &event );
+ void OnAddButton( wxCommandEvent &event );
+ void OnDeleteButton( wxCommandEvent &event );
+ void OnMoveButton( wxCommandEvent &event );
+ void OnScrollWin( wxCommandEvent &event );
+
+ wxButton *m_button;
DECLARE_DYNAMIC_CLASS(MyCanvas)
DECLARE_EVENT_TABLE()
void OnQuit( wxCommandEvent &event );
MyCanvas *m_canvas;
+ wxTextCtrl *m_log;
DECLARE_DYNAMIC_CLASS(MyFrame)
DECLARE_EVENT_TABLE()
IMPLEMENT_APP(MyApp)
+// ids
+
+#define ID_ADDBUTTON 1
+#define ID_DELBUTTON 2
+#define ID_MOVEBUTTON 3
+#define ID_SCROLLWIN 4
+
+#define ID_NEWBUTTON 10
+
// MyCanvas
IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-// EVT_PAINT(MyCanvas::OnPaint)
+ EVT_PAINT( MyCanvas::OnPaint)
+ EVT_BUTTON( ID_ADDBUTTON, MyCanvas::OnAddButton)
+ EVT_BUTTON( ID_DELBUTTON, MyCanvas::OnDeleteButton)
+ EVT_BUTTON( ID_MOVEBUTTON, MyCanvas::OnMoveButton)
+ EVT_BUTTON( ID_SCROLLWIN, MyCanvas::OnScrollWin)
END_EVENT_TABLE()
MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER | wxTAB_TRAVERSAL, "test canvas" )
{
+ (void) new wxButton( this, ID_ADDBUTTON, "add button", wxPoint(10,10) );
+ (void) new wxButton( this, ID_DELBUTTON, "del button", wxPoint(10,40) );
+ (void) new wxButton( this, ID_MOVEBUTTON, "move button", wxPoint(150,10) );
+ (void) new wxButton( this, ID_SCROLLWIN, "scroll win", wxPoint(250,10) );
+
wxString choices[] =
{
"This",
"examples."
};
- (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
+ m_button = new wxButton( this, -1, "wxButton", wxPoint(10,110) );
- (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
+ (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,150) );
- (void) new wxRadioButton( this, -1, "Disable", wxPoint(10,90) );
+ (void) new wxRadioButton( this, -1, "Disable", wxPoint(10,190) );
- (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
+ (void) new wxComboBox( this, -1, "This", wxPoint(10,230), wxDefaultSize, 5, choices );
- (void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_COLS );
+ (void) new wxRadioBox( this, -1, "This", wxPoint(10,310), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_COLS );
- (void) new wxRadioBox( this, -1, "This", wxPoint(10,300), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_ROWS );
+ (void) new wxRadioBox( this, -1, "This", wxPoint(10,440), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_ROWS );
- wxListCtrl *m_listCtrl = new wxListCtrl(
- this, -1, wxPoint(200, 10), wxSize(180, 120),
+ wxListCtrl *m_listCtrl = new wxListCtrl(
+ this, -1, wxPoint(200, 110), wxSize(180, 120),
wxLC_REPORT | wxSIMPLE_BORDER | wxLC_SINGLE_SEL );
- m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
- m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
+ m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
+ m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
- for ( int i=0; i < 30; i++)
- {
- char buf[20];
- sprintf(buf, "Item %d", i);
- m_listCtrl->InsertItem(i, buf);
- }
- m_listCtrl->SetItemState( 3, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ for ( int i=0; i < 30; i++)
+ {
+ char buf[20];
+ sprintf(buf, "Item %d", i);
+ m_listCtrl->InsertItem(i, buf);
+ }
+ m_listCtrl->SetItemState( 3, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
- (void) new wxListBox( this, -1, wxPoint(200,180), wxSize(180,120), 5, choices, wxLB_ALWAYS_SB );
+ (void) new wxListBox( this, -1, wxPoint(260,280), wxSize(120,120), 5, choices, wxLB_ALWAYS_SB );
- wxWindow *test = new wxWindow( this, -1, wxPoint(10, 400), wxSize(130,120), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
- test->SetBackgroundColour( "WHEAT" );
- wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
+ wxWindow *test = new wxWindow( this, -1, wxPoint(10, 530), wxSize(130,120), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
+ test->SetBackgroundColour( "WHEAT" );
+ wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
- test = new wxWindow( this, -1, wxPoint(160, 400), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
- test->SetBackgroundColour( "WHEAT" );
- test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
- test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
- test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
+ test = new wxWindow( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
+ test->SetBackgroundColour( "WHEAT" );
+ test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
+ test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
+ test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
- test = new wxWindow( this, -1, wxPoint(310, 400), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
- test->SetBackgroundColour( "WHEAT" );
- test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
- test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
- test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
+ test = new wxWindow( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
+ test->SetBackgroundColour( "WHEAT" );
+ test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
+ test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
+ test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
- SetBackgroundColour( "WHEAT" );
+ SetBackgroundColour( "WHEAT" );
- SetCursor( wxCursor( wxCURSOR_IBEAM ) );
+ SetCursor( wxCursor( wxCURSOR_IBEAM ) );
}
MyCanvas::~MyCanvas()
{
}
+void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
+{
+ wxLogMessage( "Inserting button at position 50,50" );
+ (void) new wxButton( this, ID_NEWBUTTON, "new button", wxPoint(50,50) );
+}
+
+void MyCanvas::OnDeleteButton( wxCommandEvent &event )
+{
+ wxLogMessage( "deleting button inserted with ""add button""" );
+ wxWindow *win = FindWindow( ID_NEWBUTTON );
+ if (win)
+ win->Destroy();
+ else
+ wxLogMessage( "-> No window with id = ID_NEWBUTTON found." );
+}
+
+void MyCanvas::OnMoveButton( wxCommandEvent &event )
+{
+ wxLogMessage( "Moving button 10 pixels downward.." );
+ wxWindow *win = FindWindow( event.GetId() );
+ win->Move( -1, win->GetPosition().y + 10 );
+}
+
+void MyCanvas::OnScrollWin( wxCommandEvent &WXUNUSED(event) )
+{
+ wxLogMessage( "Scrolling 2 units up.\nThe white square and the controls should move equally!" );
+ int x,y;
+ ViewStart( &x, &y );
+ Scroll( -1, y+2 );
+}
+
void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
- wxPaintDC dc( this );
- PrepareDC( dc );
+ wxPaintDC dc( this );
+ PrepareDC( dc );
- dc.DrawText( "Some text", 110, 10 );
+ dc.DrawText( "Some text", 140, 140 );
- dc.DrawRectangle( 50, 30, 200, 200 );
+ dc.DrawRectangle( 100, 160, 200, 200 );
}
// MyFrame
MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample",
- wxPoint(20,20), wxSize(470,360) )
+ wxPoint(20,20), wxSize(470,500) )
{
- wxMenu *file_menu = new wxMenu();
- file_menu->Append( ID_ABOUT, "&About..");
- file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
+ wxMenu *file_menu = new wxMenu();
+ file_menu->Append( ID_ABOUT, "&About..");
+ file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
- wxMenuBar *menu_bar = new wxMenuBar();
- menu_bar->Append(file_menu, "&File");
+ wxMenuBar *menu_bar = new wxMenuBar();
+ menu_bar->Append(file_menu, "&File");
- SetMenuBar( menu_bar );
+ SetMenuBar( menu_bar );
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
+ CreateStatusBar(2);
+ int widths[] = { -1, 100 };
+ SetStatusWidths( 2, widths );
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
- m_canvas->SetScrollbars( 10, 10, 50, 100 );
+ m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(100,100) );
+ m_canvas->SetScrollbars( 10, 10, 50, 100 );
+
+ m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
+ wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
+ delete old_log;
+
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+ topsizer->Add( m_canvas, 1, wxEXPAND );
+ topsizer->Add( m_log, 0, wxEXPAND );
+
+ SetAutoLayout( TRUE );
+ SetSizer( topsizer );
}
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
if (x_pos != -1)
{
+ int old_x = m_xScrollPosition;
m_xScrollPosition = x_pos;
// Calculate page size i.e. number of scroll units you get on the
m_xScrollPosition = wxMax( 0, m_xScrollPosition );
SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+
+ ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
}
if (y_pos != -1)
{
+ int old_y = m_yScrollPosition;
m_yScrollPosition = y_pos;
// Calculate page size i.e. number of scroll units you get on the
m_yScrollPosition = wxMax( 0, m_yScrollPosition );
SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+
+ ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
}
#ifdef __WXMSW__
- ::UpdateWindow ((HWND) GetHWND());
+// ::UpdateWindow ((HWND) GetHWND());
#else
- Refresh();
+// Refresh();
#endif
}
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/image.h"
+#include "wx/gtk/win_gtk.h"
#include <math.h> // for floating-point functions
#include "gdk/gdk.h"
wxASSERT_MSG( widget, wxT("DC needs a widget") );
- m_window = widget->window;
+ GtkMyFixed *myfixed = GTK_MYFIXED( widget );
+ m_window = myfixed->bin_window;
/* not realized ? */
if (!m_window)
/* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.c
-// Purpose: native GTK+ widget for wxWindows
+// Purpose: Native GTK+ widget for wxWindows, based on GtkLayout and
+// GtkFixed. It makes use of the gravity window property and
+// therefore does not work with GTK 1.0.
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
#include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h"
-#include "gtk/gtknotebook.h"
-#include "gtk/gtkscrolledwindow.h"
+#include "gtk/gtkprivate.h"
+#include "gdk/gdkx.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-static void gtk_myfixed_class_init (GtkMyFixedClass *klass);
-static void gtk_myfixed_init (GtkMyFixed *myfixed);
-static void gtk_myfixed_map (GtkWidget *widget);
-#if (GTK_MINOR_VERSION == 0)
-static void gtk_myfixed_unmap (GtkWidget *widget);
-#endif
-static void gtk_myfixed_realize (GtkWidget *widget);
+#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
+ (y >= G_MINSHORT) && (y <= G_MAXSHORT))
+
+typedef struct _GtkMyFixedAdjData GtkMyFixedAdjData;
+typedef struct _GtkMyFixedChild GtkMyFixedChild;
+
+struct _GtkMyFixedAdjData
+{
+ gint dx;
+ gint dy;
+};
+
+struct _GtkMyFixedChild
+{
+ GtkWidget *widget;
+ gint x;
+ gint y;
+ gint width;
+ gint height;
+};
+
+static void gtk_myfixed_class_init (GtkMyFixedClass *klass);
+static void gtk_myfixed_init (GtkMyFixed *myfixed);
+
+static void gtk_myfixed_realize (GtkWidget *widget);
+static void gtk_myfixed_unrealize (GtkWidget *widget);
+
+static void gtk_myfixed_map (GtkWidget *widget);
+
static void gtk_myfixed_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_myfixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_myfixed_paint (GtkWidget *widget,
- GdkRectangle *area);
static void gtk_myfixed_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_myfixed_expose (GtkWidget *widget,
GtkWidget *widget);
static void gtk_myfixed_remove (GtkContainer *container,
GtkWidget *widget);
-static void gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION > 0)
+static void gtk_myfixed_forall (GtkContainer *container,
gboolean include_internals,
-#endif
GtkCallback callback,
gpointer callback_data);
-#if (GTK_MINOR_VERSION > 0)
+
+static void gtk_myfixed_position_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child);
+static void gtk_myfixed_allocate_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child);
+static void gtk_myfixed_position_children (GtkMyFixed *myfixed);
+
+static void gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
+ gpointer cb_data);
+static void gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy);
+
+
+static void gtk_myfixed_expose_area (GtkMyFixed *myfixed,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+static void gtk_myfixed_adjustment_changed (GtkAdjustment *adjustment,
+ GtkMyFixed *myfixed);
+static GdkFilterReturn gtk_myfixed_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data);
+static GdkFilterReturn gtk_myfixed_main_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data);
+
+
static GtkType gtk_myfixed_child_type (GtkContainer *container);
-#endif
-#if (GTK_MINOR_VERSION > 0)
static void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *hadj,
GtkAdjustment *vadj);
-#endif
-
static GtkContainerClass *parent_class = NULL;
+static gboolean gravity_works;
guint
gtk_myfixed_get_type ()
sizeof (GtkMyFixedClass),
(GtkClassInitFunc) gtk_myfixed_class_init,
(GtkObjectInitFunc) gtk_myfixed_init,
-#if (GTK_MINOR_VERSION > 0)
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
-#else
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
-#endif
};
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
}
object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
-
-#if (GTK_MINOR_VERSION > 0)
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-#else
- parent_class = gtk_type_class (gtk_container_get_type ());
-#endif
widget_class->map = gtk_myfixed_map;
-#if (GTK_MINOR_VERSION == 0)
- widget_class->unmap = gtk_myfixed_unmap;
-#endif
widget_class->realize = gtk_myfixed_realize;
+ widget_class->unrealize = gtk_myfixed_unrealize;
widget_class->size_request = gtk_myfixed_size_request;
widget_class->size_allocate = gtk_myfixed_size_allocate;
widget_class->draw = gtk_myfixed_draw;
container_class->add = gtk_myfixed_add;
container_class->remove = gtk_myfixed_remove;
-#if (GTK_MINOR_VERSION > 0)
- container_class->forall = gtk_myfixed_foreach;
-#else
- container_class->foreach = gtk_myfixed_foreach;
-#endif
+ container_class->forall = gtk_myfixed_forall;
-#if (GTK_MINOR_VERSION > 0)
container_class->child_type = gtk_myfixed_child_type;
-#endif
-#if (GTK_MINOR_VERSION > 0)
klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
widget_class->set_scroll_adjustments_signal =
GTK_SIGNAL_OFFSET (GtkMyFixedClass, set_scroll_adjustments),
gtk_marshal_NONE__POINTER_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-#endif
}
-#if (GTK_MINOR_VERSION > 0)
static GtkType
gtk_myfixed_child_type (GtkContainer *container)
{
return GTK_TYPE_WIDGET;
}
-#endif
static void
gtk_myfixed_init (GtkMyFixed *myfixed)
{
GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-#if (GTK_MINOR_VERSION == 0)
- GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
-#endif
-
-#if (GTK_MINOR_VERSION > 0)
myfixed->shadow_type = GTK_MYSHADOW_NONE;
-#endif
myfixed->children = NULL;
+
+ myfixed->width = 20;
+ myfixed->height = 20;
+
+ myfixed->bin_window = NULL;
+
+ myfixed->configure_serial = 0;
+ myfixed->scroll_x = 0;
+ myfixed->scroll_y = 0;
+ myfixed->visibility = GDK_VISIBILITY_PARTIAL;
}
GtkWidget*
return GTK_WIDGET (myfixed);
}
-#if (GTK_MINOR_VERSION > 0)
void
gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
- /* OK, this is embarassing, but this function has to be here */
+ /* We handle scrolling in the wxScrolledWindow, not here. */
}
void
}
}
}
-#endif
void
gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GtkMyFixedChild *child_info;
g_return_if_fail (widget != NULL);
child_info = g_new (GtkMyFixedChild, 1);
+
child_info->widget = widget;
child_info->x = x;
child_info->y = y;
child_info->width = width;
child_info->height = height;
+ myfixed->children = g_list_append (myfixed->children, child_info);
+
gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
- myfixed->children = g_list_append (myfixed->children, child_info);
+ if (GTK_WIDGET_REALIZED (myfixed))
+ gtk_widget_set_parent_window (widget, myfixed->bin_window);
+
+ if (!IS_ONSCREEN (x, y))
+ GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
if (GTK_WIDGET_REALIZED (myfixed))
gtk_widget_realize (widget);
+ gtk_widget_set_usize (widget, width, height);
+
if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
{
if (GTK_WIDGET_MAPPED (myfixed))
gtk_widget_map (widget);
- gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+ gtk_widget_queue_resize (widget);
}
}
void
gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y)
+ gint x,
+ gint y)
{
GtkMyFixedChild *child;
GList *children;
if (child->widget == widget)
{
- gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
+ if ((child->x == x) && (child->y == y))
+ break;
+
+ child->x = x;
+ child->y = y;
+
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
+ gtk_widget_queue_resize (widget);
break;
}
}
void
gtk_myfixed_resize (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 width,
- gint16 height)
+ gint width,
+ gint height)
{
GtkMyFixedChild *child;
GList *children;
if (child->widget == widget)
{
- gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
- break;
+ if ((child->width == width) && (child->height == height))
+ break;
+
+ child->width = width;
+ child->height = height;
+
+ gtk_widget_set_usize (widget, width, height);
+
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
+ gtk_widget_queue_resize (widget);
+ break;
}
}
}
void
gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GtkMyFixedChild *child;
GList *children;
child->y = y;
child->width = width;
child->height = height;
-
+
+ gtk_widget_set_usize (widget, width, height);
+
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
- {
- if ( (child->width > 1) &&
- (child->height > 1) &&
- !(GTK_WIDGET_REALIZED(widget) && GTK_IS_NOTEBOOK(widget)) )
- {
- child_allocation.x = child->x;
- child_allocation.y = child->y;
- child_allocation.width = MAX( child->width, 1 );
- child_allocation.height = MAX( child->height, 1 );
-
- /* work around for GTK bug when moving widgets outside
- the X window -> do NOT move them entirely outside */
- if (child_allocation.y + child_allocation.height < 0)
- child_allocation.y = -child_allocation.height;
- if (child_allocation.x + child_allocation.width < 0)
- child_allocation.x = -child_allocation.width;
-
- gtk_widget_size_allocate (widget, &child_allocation);
- }
- else
- {
- gtk_widget_queue_resize (GTK_WIDGET (myfixed));
- }
- }
+ gtk_widget_queue_resize (widget);
+
break;
}
}
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
+ if ( GTK_WIDGET_VISIBLE (child->widget) &&
+ !GTK_WIDGET_MAPPED (child->widget) &&
+ !GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ {
gtk_widget_map (child->widget);
+ }
}
gdk_window_show (widget->window);
+ gdk_window_show (myfixed->bin_window);
}
-#if (GTK_MINOR_VERSION == 0)
-static void
-gtk_myfixed_unmap (GtkWidget *widget)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (widget));
-
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-}
-#endif
-
static void
gtk_myfixed_realize (GtkWidget *widget)
{
GtkMyFixed *myfixed;
GdkWindowAttr attributes;
gint attributes_mask;
+ GtkMyFixedChild *child;
+ GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget));
attributes.window_type = GDK_WINDOW_CHILD;
-#if (GTK_MINOR_VERSION > 0)
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
attributes.width = widget->allocation.width;
attributes.height -= 4;
}
+ /* minimal size */
if (attributes.width < 2) attributes.width = 2;
if (attributes.height < 2) attributes.height = 2;
-#else
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = 32000;
- attributes.height = 32000;
-#endif
+
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask =
+ GDK_VISIBILITY_NOTIFY_MASK;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (widget->window, widget);
+
+ attributes.x = 0;
+ attributes.y = 0;
+
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |=
GDK_EXPOSURE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new( gtk_widget_get_parent_window (widget), &attributes,
- attributes_mask);
- gdk_window_set_user_data (widget->window, widget);
+ myfixed->bin_window = gdk_window_new (widget->window,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (myfixed->bin_window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, myfixed->bin_window, GTK_STATE_NORMAL);
+
+ /* add filters for intercepting visibility and expose events */
+ gdk_window_add_filter (widget->window, gtk_myfixed_main_filter, myfixed);
+ gdk_window_add_filter (myfixed->bin_window, gtk_myfixed_filter, myfixed);
+
+ /* we NEED gravity or we'll give up */
+ gravity_works = gdk_window_set_static_gravities (myfixed->bin_window, TRUE);
+
+ /* cannot be done before realisation */
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ gtk_widget_set_parent_window (child->widget, myfixed->bin_window);
+ }
+}
+
+static void
+gtk_myfixed_unrealize (GtkWidget *widget)
+{
+ GtkMyFixed *myfixed;
+
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (widget));
+
+ myfixed = GTK_MYFIXED (widget);
+
+ gdk_window_set_user_data (myfixed->bin_window, NULL);
+ gdk_window_destroy (myfixed->bin_window);
+ myfixed->bin_window = NULL;
+
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static void
{
GtkMyFixed *myfixed;
gint border;
+ gint x,y,w,h;
GtkMyFixedChild *child;
GtkAllocation child_allocation;
- GList *children;
+ GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED(widget));
myfixed = GTK_MYFIXED (widget);
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ gtk_myfixed_position_child (myfixed, child);
+ gtk_myfixed_allocate_child (myfixed, child);
+ }
+
widget->allocation = *allocation;
-#if (GTK_MINOR_VERSION > 0)
+
if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
border = 0;
else
border = 1;
else
border = 2;
-#else
- border = 0;
-#endif
+
+ x = allocation->x + border;
+ y = allocation->y + border;
+ w = allocation->width - border*2;
+ h = allocation->height - border*2;
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_move_resize( widget->window,
- allocation->x+border, allocation->y+border,
-#if (GTK_MINOR_VERSION > 0)
- allocation->width-border*2, allocation->height-border*2
-#else
- 32000, 32000
-#endif
- );
- }
-
- children = myfixed->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget))
- {
-/* please look at the text in wxWindow::DoSetSize() on why the
- test GTK_WIDGET_REALIZED() has to be here */
-/* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
- {
- gtk_widget_queue_resize( child->widget );
- }
- else */
- {
- child_allocation.x = child->x;
- child_allocation.y = child->y;
- child_allocation.width = MAX( child->width, 1 );
- child_allocation.height = MAX( child->height, 1 );
-
- /* work around for GTK bug when moving widgets outside
- the X window -> do NOT move them entirely outside */
- if (child_allocation.y + child_allocation.height < 0)
- child_allocation.y = -child_allocation.height;
- if (child_allocation.x + child_allocation.width < 0)
- child_allocation.x = -child_allocation.width;
-
- gtk_widget_size_allocate (child->widget, &child_allocation);
- }
- }
+ gdk_window_move_resize( widget->window, x, y, w, h );
+ gdk_window_move_resize( myfixed->bin_window, 0, 0, w, h );
}
}
static void
-gtk_myfixed_paint (GtkWidget *widget,
- GdkRectangle *area)
+gtk_myfixed_draw (GtkWidget *widget,
+ GdkRectangle *area)
{
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GdkRectangle child_area;
+ GList *children;
+
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget));
- g_return_if_fail (area != NULL);
- if (GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear_area (widget->window,
- area->x, area->y,
- area->width, area->height);
+ myfixed = GTK_MYFIXED (widget);
+
+ children = myfixed->children;
+ if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) )
+ {
+ gdk_window_clear_area( myfixed->bin_window,
+ area->x, area->y, area->width, area->height);
+ }
+
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ if (gtk_widget_intersect (child->widget, area, &child_area))
+ gtk_widget_draw (child->widget, &child_area);
+ }
}
+/*
static void
-gtk_myfixed_draw (GtkWidget *widget,
- GdkRectangle *area)
+gtk_myfixed_draw_border (GtkMyFixed *myfixed)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GdkRectangle child_area;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (widget));
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET(myfixed);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
+ return;
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_OUT)
{
- myfixed = GTK_MYFIXED (widget);
-
- children = myfixed->children;
- if (children) /* mini optimisation */
- gtk_myfixed_paint (widget, area);
-
- while (children)
- {
- child = children->data;
- children = children->next;
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height );
+ return;
+ }
- if (gtk_widget_intersect (child->widget, area, &child_area))
- gtk_widget_draw (child->widget, &child_area);
- }
+ if (myfixed->shadow_type == GTK_MYSHADOW_IN)
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height );
+ return;
+ }
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_THIN)
+ {
+ GdkGC *gc;
+ gc = gdk_gc_new( widget->window );
+ gdk_gc_set_foreground( gc, &widget->style->black );
+ gdk_draw_rectangle( widget->window, gc, FALSE,
+ 0, 0,
+ widget->allocation.width-1,
+ widget->allocation.height-1 );
+ gdk_gc_unref( gc );
+ return;
}
}
+*/
static gint
gtk_myfixed_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GdkEventExpose child_event;
- GList *children;
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GdkEventExpose child_event;
+ GList *children;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
+
+ myfixed = GTK_MYFIXED (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+/*
+ if (event->window == widget->window)
{
- myfixed = GTK_MYFIXED (widget);
+ gtk_myfixed_draw_border( myfixed );
+ return FALSE;
+ }
+*/
- child_event = *event;
+ if (event->window != myfixed->bin_window)
+ return FALSE;
- children = myfixed->children;
- while (children)
- {
- child = children->data;
- children = children->next;
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- gtk_widget_intersect (child->widget, &event->area,
- &child_event.area))
+ child_event = *event;
+
+ if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+ GTK_WIDGET_DRAWABLE (child->widget) &&
+ gtk_widget_intersect (child->widget, &event->area, &child_event.area))
+ {
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
}
}
- return FALSE;
+ return FALSE;
}
static void
gtk_myfixed_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (container));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (container));
+ g_return_if_fail (widget != NULL);
- gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
+ gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
}
static void
gtk_myfixed_remove (GtkContainer *container,
- GtkWidget *widget)
+ GtkWidget *widget)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GList *children;
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (container));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (container));
+ g_return_if_fail (widget != NULL);
- myfixed = GTK_MYFIXED (container);
+ myfixed = GTK_MYFIXED (container);
- children = myfixed->children;
- while (children)
+ children = myfixed->children;
+ while (children)
{
- child = children->data;
+ child = children->data;
- if (child->widget == widget)
+ if (child->widget == widget)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
-
- gtk_widget_unparent (widget);
+ gtk_widget_unparent (widget);
- /* security checks */
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ /* security checks */
+ g_return_if_fail (GTK_IS_WIDGET (widget));
- myfixed->children = g_list_remove_link (myfixed->children, children);
- g_list_free (children);
- g_free (child);
-
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ myfixed->children = g_list_remove_link (myfixed->children, children);
+ g_list_free (children);
+ g_free (child);
- /* security checks */
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- break;
+ /* security checks */
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
+
+ break;
}
- children = children->next;
+ children = children->next;
}
}
static void
-gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION > 0)
+gtk_myfixed_forall (GtkContainer *container,
gboolean include_internals,
-#endif
GtkCallback callback,
gpointer callback_data)
{
}
+/* Operations on children
+ */
+
+static void
+gtk_myfixed_position_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child)
+{
+ gint x;
+ gint y;
+
+ x = child->x - myfixed->xoffset;
+ y = child->y - myfixed->yoffset;
+
+ if (IS_ONSCREEN (x,y))
+ {
+ if (GTK_WIDGET_MAPPED (myfixed) &&
+ GTK_WIDGET_VISIBLE (child->widget))
+ {
+ if (!GTK_WIDGET_MAPPED (child->widget))
+ gtk_widget_map (child->widget);
+ }
+
+ if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
+ }
+ else
+ {
+ if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
+
+ if (GTK_WIDGET_MAPPED (child->widget))
+ gtk_widget_unmap (child->widget);
+ }
+}
+
+static void
+gtk_myfixed_allocate_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child)
+{
+ GtkAllocation allocation;
+ GtkRequisition requisition;
+
+ allocation.x = child->x - myfixed->xoffset;
+ allocation.y = child->y - myfixed->yoffset;
+ gtk_widget_get_child_requisition (child->widget, &requisition);
+ allocation.width = requisition.width;
+ allocation.height = requisition.height;
+
+ gtk_widget_size_allocate (child->widget, &allocation);
+}
+
+static void
+gtk_myfixed_position_children (GtkMyFixed *myfixed)
+{
+ GList *tmp_list;
+
+ tmp_list = myfixed->children;
+ while (tmp_list)
+ {
+ GtkMyFixedChild *child = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ gtk_myfixed_position_child (myfixed, child);
+ }
+}
+
+static void
+gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
+ gpointer cb_data)
+{
+ GtkMyFixedAdjData *data = cb_data;
+
+ widget->allocation.x += data->dx;
+ widget->allocation.y += data->dy;
+
+ if (GTK_WIDGET_NO_WINDOW (widget) &&
+ GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget),
+ gtk_myfixed_adjust_allocations_recurse,
+ cb_data);
+}
+
+static void
+gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy)
+{
+ GList *tmp_list;
+ GtkMyFixedAdjData data;
+
+ data.dx = dx;
+ data.dy = dy;
+
+ tmp_list = myfixed->children;
+ while (tmp_list)
+ {
+ GtkMyFixedChild *child = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ child->widget->allocation.x += dx;
+ child->widget->allocation.y += dy;
+
+ if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+ GTK_IS_CONTAINER (child->widget))
+ gtk_container_forall (GTK_CONTAINER (child->widget),
+ gtk_myfixed_adjust_allocations_recurse,
+ &data);
+ }
+}
+
+/* Callbacks */
+
+/* Send a synthetic expose event to the widget
+ */
+static void
+gtk_myfixed_expose_area (GtkMyFixed *myfixed,
+ gint x, gint y, gint width, gint height)
+{
+ if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
+ {
+ GdkEventExpose event;
+
+ event.type = GDK_EXPOSE;
+ event.send_event = TRUE;
+ event.window = myfixed->bin_window;
+ event.count = 0;
+
+ event.area.x = x;
+ event.area.y = y;
+ event.area.width = width;
+ event.area.height = height;
+
+ gdk_window_ref (event.window);
+ gtk_widget_event (GTK_WIDGET (myfixed), (GdkEvent *)&event);
+ gdk_window_unref (event.window);
+ }
+}
+
+/* This function is used to find events to process while scrolling
+ */
+
+static Bool
+gtk_myfixed_expose_predicate (Display *display,
+ XEvent *xevent,
+ XPointer arg)
+{
+ if ((xevent->type == Expose) ||
+ ((xevent->xany.window == *(Window *)arg) &&
+ (xevent->type == ConfigureNotify)))
+ return True;
+ else
+ return False;
+}
+
+/* This is the main routine to do the scrolling. Scrolling is
+ * done by "Guffaw" scrolling, as in the Mozilla XFE, with
+ * a few modifications.
+ *
+ * The main improvement is that we keep track of whether we
+ * are obscured or not. If not, we ignore the generated expose
+ * events and instead do the exposes ourself, without having
+ * to wait for a roundtrip to the server. This also provides
+ * a limited form of expose-event compression, since we do
+ * the affected area as one big chunk.
+ */
+
+void
+gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy)
+{
+ GtkWidget *widget;
+ XEvent xevent;
+
+ gint x,y,w,h,border;
+
+ widget = GTK_WIDGET (myfixed);
+
+ myfixed->xoffset += dx;
+ myfixed->yoffset += dy;
+
+ if (!GTK_WIDGET_MAPPED (myfixed))
+ {
+ gtk_myfixed_position_children (myfixed);
+ return;
+ }
+
+ gtk_myfixed_adjust_allocations (myfixed, -dx, -dy);
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
+ border = 0;
+ else
+ if (myfixed->shadow_type == GTK_MYSHADOW_THIN)
+ border = 1;
+ else
+ border = 2;
+
+ x = 0;
+ y = 0;
+ w = widget->allocation.width - 2*border;
+ h = widget->allocation.height - 2*border;
+
+ if (dx > 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_resize (myfixed->bin_window,
+ w + dx,
+ h);
+ gdk_window_move (myfixed->bin_window, x-dx, y);
+ gdk_window_move_resize (myfixed->bin_window, x, y, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ MAX ((gint)w - dx, 0),
+ 0,
+ MIN (dx, w),
+ h);
+ }
+ else if (dx < 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_move_resize (myfixed->bin_window,
+ x + dx,
+ y,
+ w - dx,
+ h);
+ gdk_window_move (myfixed->bin_window, x, y);
+ gdk_window_resize (myfixed->bin_window, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ 0,
+ MIN (-dx, w),
+ h);
+ }
+
+ if (dy > 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_resize (myfixed->bin_window, w, h + dy);
+ gdk_window_move (myfixed->bin_window, x, y-dy);
+ gdk_window_move_resize (myfixed->bin_window,
+ x, y, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ MAX ((gint)h - dy, 0),
+ w,
+ MIN (dy, h));
+ }
+ else if (dy < 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_move_resize (myfixed->bin_window,
+ x, y+dy, w, h - dy );
+ gdk_window_move (myfixed->bin_window, x, y);
+ gdk_window_resize (myfixed->bin_window, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ 0,
+ w,
+ MIN (-dy, (gint)h));
+ }
+
+ gtk_myfixed_position_children (myfixed);
+
+ /* We have to make sure that all exposes from this scroll get
+ * processed before we scroll again, or the expose events will
+ * have invalid coordinates.
+ *
+ * We also do expose events for other windows, since otherwise
+ * their updating will fall behind the scrolling
+ *
+ * This also avoids a problem in pre-1.0 GTK where filters don't
+ * have access to configure events that were compressed.
+ */
+
+ gdk_flush();
+ while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (myfixed->bin_window),
+ &xevent,
+ gtk_myfixed_expose_predicate,
+ (XPointer)&GDK_WINDOW_XWINDOW (myfixed->bin_window)))
+ {
+ GdkEvent event;
+ GtkWidget *event_widget;
+
+ if ((xevent.xany.window == GDK_WINDOW_XWINDOW (myfixed->bin_window)) &&
+ (gtk_myfixed_filter (&xevent, &event, myfixed) == GDK_FILTER_REMOVE))
+ continue;
+
+ if (xevent.type == Expose)
+ {
+ event.expose.window = gdk_window_lookup (xevent.xany.window);
+ gdk_window_get_user_data (event.expose.window,
+ (gpointer *)&event_widget);
+
+ if (event_widget)
+ {
+ event.expose.type = GDK_EXPOSE;
+ event.expose.area.x = xevent.xexpose.x;
+ event.expose.area.y = xevent.xexpose.y;
+ event.expose.area.width = xevent.xexpose.width;
+ event.expose.area.height = xevent.xexpose.height;
+ event.expose.count = xevent.xexpose.count;
+
+ gdk_window_ref (event.expose.window);
+ gtk_widget_event (event_widget, &event);
+ gdk_window_unref (event.expose.window);
+ }
+ }
+ }
+}
+
+/* The main event filter. Actually, we probably don't really need
+ * to install this as a filter at all, since we are calling it
+ * directly above in the expose-handling hack. But in case scrollbars
+ * are fixed up in some manner...
+ *
+ * This routine identifies expose events that are generated when
+ * we've temporarily moved the bin_window_origin, and translates
+ * them or discards them, depending on whether we are obscured
+ * or not.
+ */
+static GdkFilterReturn
+gtk_myfixed_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data)
+{
+ XEvent *xevent;
+ GtkMyFixed *myfixed;
+
+ xevent = (XEvent *)gdk_xevent;
+ myfixed = GTK_MYFIXED (data);
+
+ switch (xevent->type)
+ {
+ case Expose:
+ if (xevent->xexpose.serial == myfixed->configure_serial)
+ {
+ if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
+ return GDK_FILTER_REMOVE;
+ else
+ {
+ xevent->xexpose.x += myfixed->scroll_x;
+ xevent->xexpose.y += myfixed->scroll_y;
+
+ break;
+ }
+ }
+ break;
+
+ case ConfigureNotify:
+ if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
+ {
+ myfixed->configure_serial = xevent->xconfigure.serial;
+ myfixed->scroll_x = xevent->xconfigure.x;
+ myfixed->scroll_y = xevent->xconfigure.y;
+ }
+ break;
+ }
+
+ return GDK_FILTER_CONTINUE;
+}
+
+/* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
+ * there is no corresponding event in GTK, so we have
+ * to get the events from a filter
+ */
+static GdkFilterReturn
+gtk_myfixed_main_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data)
+{
+ XEvent *xevent;
+ GtkMyFixed *myfixed;
+
+ xevent = (XEvent *)gdk_xevent;
+ myfixed = GTK_MYFIXED (data);
+
+ if (xevent->type == VisibilityNotify)
+ {
+ switch (xevent->xvisibility.state)
+ {
+ case VisibilityFullyObscured:
+ myfixed->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
+ break;
+
+ case VisibilityPartiallyObscured:
+ myfixed->visibility = GDK_VISIBILITY_PARTIAL;
+ break;
+
+ case VisibilityUnobscured:
+ myfixed->visibility = GDK_VISIBILITY_UNOBSCURED;
+ break;
+ }
+
+ return GDK_FILTER_REMOVE;
+ }
+
+
+ return GDK_FILTER_CONTINUE;
+}
+
+
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
+//-----------------------------------------------------------------------------
+// local code (see below)
+//-----------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION > 0)
+
+static void draw_frame( GtkWidget *widget, wxWindow *win )
+{
+ if (!win->m_hasVMT)
+ return;
+
+ int dw = 0;
+ int dh = 0;
+
+ if (win->HasScrolling())
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
+
+/*
+ GtkWidget *hscrollbar = scroll_window->hscrollbar;
+ GtkWidget *vscrollbar = scroll_window->vscrollbar;
+
+ we use this instead: range.slider_width = 11 + 2*2pts edge
+*/
+
+ if (scroll_window->vscrollbar_visible)
+ {
+ dw += 15; /* dw += vscrollbar->allocation.width; */
+ dw += scroll_class->scrollbar_spacing;
+ }
+
+ if (scroll_window->hscrollbar_visible)
+ {
+ dh += 15; /* dh += hscrollbar->allocation.height; */
+ dh += scroll_class->scrollbar_spacing;
+ }
+ }
+
+ int dx = 0;
+ int dy = 0;
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ {
+ dx += widget->allocation.x;
+ dy += widget->allocation.y;
+ }
+
+ if (win->HasFlag(wxRAISED_BORDER))
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ dx, dy,
+ win->m_width-dw, win->m_height-dh );
+ return;
+ }
+
+ if (win->HasFlag(wxSUNKEN_BORDER))
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ dx, dy,
+ win->m_width-dw, win->m_height-dh );
+ return;
+ }
+
+ if (win->HasFlag(wxSIMPLE_BORDER))
+ {
+ GdkGC *gc;
+ gc = gdk_gc_new( widget->window );
+ gdk_gc_set_foreground( gc, &widget->style->black );
+ gdk_draw_rectangle( widget->window, gc, FALSE,
+ dx, dy,
+ win->m_width-dw-1, win->m_height-dh-1 );
+ gdk_gc_unref( gc );
+ return;
+ }
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" of m_widget
+//-----------------------------------------------------------------------------
+
+static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
+{
+ if (gdk_event->count > 0) return;
+ draw_frame( widget, win );
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
+{
+ draw_frame( widget, win );
+}
+
+#endif // GTK_MINOR_VERSION > 0
+
//-----------------------------------------------------------------------------
// key event conversion routines
//-----------------------------------------------------------------------------
return (key_code);
}
-//-----------------------------------------------------------------------------
-// local code (see below)
-//-----------------------------------------------------------------------------
-
-#if (GTK_MINOR_VERSION > 0)
-
-static void draw_frame( GtkWidget *widget, wxWindow *win )
-{
- if (!win->m_hasVMT)
- return;
-
- int dw = 0;
- int dh = 0;
-
- if (win->HasScrolling())
- {
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
-
-/*
- GtkWidget *hscrollbar = scroll_window->hscrollbar;
- GtkWidget *vscrollbar = scroll_window->vscrollbar;
-
- we use this instead: range.slider_width = 11 + 2*2pts edge
-*/
-
- if (scroll_window->vscrollbar_visible)
- {
- dw += 15; /* dw += vscrollbar->allocation.width; */
- dw += scroll_class->scrollbar_spacing;
- }
-
- if (scroll_window->hscrollbar_visible)
- {
- dh += 15; /* dh += hscrollbar->allocation.height; */
- dh += scroll_class->scrollbar_spacing;
- }
- }
-
- int dx = 0;
- int dy = 0;
- if (GTK_WIDGET_NO_WINDOW (widget))
- {
- dx += widget->allocation.x;
- dy += widget->allocation.y;
- }
-
- if (win->HasFlag(wxRAISED_BORDER))
- {
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- dx, dy,
- win->m_width-dw, win->m_height-dh );
- return;
- }
-
- if (win->HasFlag(wxSUNKEN_BORDER))
- {
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_IN,
- dx, dy,
- win->m_width-dw, win->m_height-dh );
- return;
- }
-
- if (win->HasFlag(wxSIMPLE_BORDER))
- {
- GdkGC *gc = gdk_gc_new( widget->window );
- gdk_gc_set_foreground( gc, &widget->style->black );
- gdk_draw_rectangle( widget->window, gc, FALSE,
- dx, dy,
- win->m_width-dw-1, win->m_height-dh-1 );
- gdk_gc_unref( gc );
- return;
- }
-}
-
-//-----------------------------------------------------------------------------
-// "expose_event" of m_widget
-//-----------------------------------------------------------------------------
-
-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
-{
- if (gdk_event->count > 0) return;
- draw_frame( widget, win );
-}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
-{
- draw_frame( widget, win );
-}
-
-#endif // GTK_MINOR_VERSION > 0
-
//-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow
//-----------------------------------------------------------------------------
if (!win->m_hasVMT)
return;
- if (gdk_event->window != win->m_wxwindow->window)
- return;
-
win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
gdk_event->area.width,
if (!win->m_hasVMT)
return;
- GtkMyFixed *myfixed = GTK_MYFIXED (widget);
- if (!myfixed->children)
- return; /* mini optimisation */
-
win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height );
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
#if (GTK_MINOR_VERSION > 0)
- /* these are called when the "sunken", "raised" or "simple" borders are drawn */
+ /* these are called when the "sunken" or "raised" borders are drawn */
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
if (m_wxwindow)
{
- GdkWindow *window = m_wxwindow->window;
+ GdkWindow *window = GTK_MYFIXED(m_wxwindow)->bin_window;
if (window)
gdk_window_set_cursor( window, cursor.GetCursor() );
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = GTK_MYFIXED(m_wxwindow)->bin_window;
else
source = m_widget->window;
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = GTK_MYFIXED(m_wxwindow)->bin_window;
else
source = m_widget->window;
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (connect_widget->window)
- {
- /* we provide this function ourselves as it is
- missing in GDK */
- gdk_window_warp_pointer( connect_widget->window, x, y );
- }
+ /* we provide this function ourselves as it is
+ missing in GDK (top of this file) */
+
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (window)
+ gdk_window_warp_pointer( window, x, y );
}
void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
{
if (rect)
{
- gdk_window_clear_area( m_wxwindow->window,
+ gdk_window_clear_area( GTK_MYFIXED(m_wxwindow)->bin_window,
rect->x, rect->y,
rect->width, rect->height );
}
else
{
- gdk_window_clear( m_wxwindow->window );
+ gdk_window_clear( GTK_MYFIXED(m_wxwindow)->bin_window );
}
}
if (!m_delayedBackgroundColour) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
return TRUE;
}
- if (m_wxwindow && m_wxwindow->window)
+ if (m_wxwindow)
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_wxwindow->window ) );
- gdk_window_set_background( m_wxwindow->window, m_backgroundColour.GetColor() );
+ m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+ gdk_window_set_background( window, m_backgroundColour.GetColor() );
}
wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
if (!m_delayedForegroundColour) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
{
- if (m_wxwindow) return (window == m_wxwindow->window);
+ if (m_wxwindow)
+ return (window == GTK_MYFIXED(m_wxwindow)->bin_window);
+
return (window == m_widget->window);
}
if (!m_delayedFont) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
wxCHECK_RET( g_captureWindow == NULL, wxT("CaptureMouse called twice") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window) return;
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window) return;
- gdk_pointer_grab( connect_widget->window, FALSE,
+ gdk_pointer_grab( window, FALSE,
(GdkEventMask)
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
wxCHECK_RET( g_captureWindow, wxT("ReleaseMouse called twice") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window) return;
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window) return;
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
g_captureWindow = (wxWindow*) NULL;
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
+ gtk_myfixed_scroll( GTK_MYFIXED(m_wxwindow), -dx, -dy );
+
+/*
if (!m_scrollGC)
{
m_scrollGC = gdk_gc_new( m_wxwindow->window );
Refresh( TRUE, &rect );
}
+*/
}
void wxWindow::SetScrolling(bool scroll)
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/image.h"
+#include "wx/gtk/win_gtk.h"
#include <math.h> // for floating-point functions
#include "gdk/gdk.h"
wxASSERT_MSG( widget, wxT("DC needs a widget") );
- m_window = widget->window;
+ GtkMyFixed *myfixed = GTK_MYFIXED( widget );
+ m_window = myfixed->bin_window;
/* not realized ? */
if (!m_window)
/* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.c
-// Purpose: native GTK+ widget for wxWindows
+// Purpose: Native GTK+ widget for wxWindows, based on GtkLayout and
+// GtkFixed. It makes use of the gravity window property and
+// therefore does not work with GTK 1.0.
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
#include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h"
-#include "gtk/gtknotebook.h"
-#include "gtk/gtkscrolledwindow.h"
+#include "gtk/gtkprivate.h"
+#include "gdk/gdkx.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-static void gtk_myfixed_class_init (GtkMyFixedClass *klass);
-static void gtk_myfixed_init (GtkMyFixed *myfixed);
-static void gtk_myfixed_map (GtkWidget *widget);
-#if (GTK_MINOR_VERSION == 0)
-static void gtk_myfixed_unmap (GtkWidget *widget);
-#endif
-static void gtk_myfixed_realize (GtkWidget *widget);
+#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
+ (y >= G_MINSHORT) && (y <= G_MAXSHORT))
+
+typedef struct _GtkMyFixedAdjData GtkMyFixedAdjData;
+typedef struct _GtkMyFixedChild GtkMyFixedChild;
+
+struct _GtkMyFixedAdjData
+{
+ gint dx;
+ gint dy;
+};
+
+struct _GtkMyFixedChild
+{
+ GtkWidget *widget;
+ gint x;
+ gint y;
+ gint width;
+ gint height;
+};
+
+static void gtk_myfixed_class_init (GtkMyFixedClass *klass);
+static void gtk_myfixed_init (GtkMyFixed *myfixed);
+
+static void gtk_myfixed_realize (GtkWidget *widget);
+static void gtk_myfixed_unrealize (GtkWidget *widget);
+
+static void gtk_myfixed_map (GtkWidget *widget);
+
static void gtk_myfixed_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_myfixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_myfixed_paint (GtkWidget *widget,
- GdkRectangle *area);
static void gtk_myfixed_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_myfixed_expose (GtkWidget *widget,
GtkWidget *widget);
static void gtk_myfixed_remove (GtkContainer *container,
GtkWidget *widget);
-static void gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION > 0)
+static void gtk_myfixed_forall (GtkContainer *container,
gboolean include_internals,
-#endif
GtkCallback callback,
gpointer callback_data);
-#if (GTK_MINOR_VERSION > 0)
+
+static void gtk_myfixed_position_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child);
+static void gtk_myfixed_allocate_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child);
+static void gtk_myfixed_position_children (GtkMyFixed *myfixed);
+
+static void gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
+ gpointer cb_data);
+static void gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy);
+
+
+static void gtk_myfixed_expose_area (GtkMyFixed *myfixed,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+static void gtk_myfixed_adjustment_changed (GtkAdjustment *adjustment,
+ GtkMyFixed *myfixed);
+static GdkFilterReturn gtk_myfixed_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data);
+static GdkFilterReturn gtk_myfixed_main_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data);
+
+
static GtkType gtk_myfixed_child_type (GtkContainer *container);
-#endif
-#if (GTK_MINOR_VERSION > 0)
static void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *hadj,
GtkAdjustment *vadj);
-#endif
-
static GtkContainerClass *parent_class = NULL;
+static gboolean gravity_works;
guint
gtk_myfixed_get_type ()
sizeof (GtkMyFixedClass),
(GtkClassInitFunc) gtk_myfixed_class_init,
(GtkObjectInitFunc) gtk_myfixed_init,
-#if (GTK_MINOR_VERSION > 0)
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
-#else
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
-#endif
};
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
}
object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
-
-#if (GTK_MINOR_VERSION > 0)
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-#else
- parent_class = gtk_type_class (gtk_container_get_type ());
-#endif
widget_class->map = gtk_myfixed_map;
-#if (GTK_MINOR_VERSION == 0)
- widget_class->unmap = gtk_myfixed_unmap;
-#endif
widget_class->realize = gtk_myfixed_realize;
+ widget_class->unrealize = gtk_myfixed_unrealize;
widget_class->size_request = gtk_myfixed_size_request;
widget_class->size_allocate = gtk_myfixed_size_allocate;
widget_class->draw = gtk_myfixed_draw;
container_class->add = gtk_myfixed_add;
container_class->remove = gtk_myfixed_remove;
-#if (GTK_MINOR_VERSION > 0)
- container_class->forall = gtk_myfixed_foreach;
-#else
- container_class->foreach = gtk_myfixed_foreach;
-#endif
+ container_class->forall = gtk_myfixed_forall;
-#if (GTK_MINOR_VERSION > 0)
container_class->child_type = gtk_myfixed_child_type;
-#endif
-#if (GTK_MINOR_VERSION > 0)
klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
widget_class->set_scroll_adjustments_signal =
GTK_SIGNAL_OFFSET (GtkMyFixedClass, set_scroll_adjustments),
gtk_marshal_NONE__POINTER_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-#endif
}
-#if (GTK_MINOR_VERSION > 0)
static GtkType
gtk_myfixed_child_type (GtkContainer *container)
{
return GTK_TYPE_WIDGET;
}
-#endif
static void
gtk_myfixed_init (GtkMyFixed *myfixed)
{
GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-#if (GTK_MINOR_VERSION == 0)
- GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
-#endif
-
-#if (GTK_MINOR_VERSION > 0)
myfixed->shadow_type = GTK_MYSHADOW_NONE;
-#endif
myfixed->children = NULL;
+
+ myfixed->width = 20;
+ myfixed->height = 20;
+
+ myfixed->bin_window = NULL;
+
+ myfixed->configure_serial = 0;
+ myfixed->scroll_x = 0;
+ myfixed->scroll_y = 0;
+ myfixed->visibility = GDK_VISIBILITY_PARTIAL;
}
GtkWidget*
return GTK_WIDGET (myfixed);
}
-#if (GTK_MINOR_VERSION > 0)
void
gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
- /* OK, this is embarassing, but this function has to be here */
+ /* We handle scrolling in the wxScrolledWindow, not here. */
}
void
}
}
}
-#endif
void
gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GtkMyFixedChild *child_info;
g_return_if_fail (widget != NULL);
child_info = g_new (GtkMyFixedChild, 1);
+
child_info->widget = widget;
child_info->x = x;
child_info->y = y;
child_info->width = width;
child_info->height = height;
+ myfixed->children = g_list_append (myfixed->children, child_info);
+
gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
- myfixed->children = g_list_append (myfixed->children, child_info);
+ if (GTK_WIDGET_REALIZED (myfixed))
+ gtk_widget_set_parent_window (widget, myfixed->bin_window);
+
+ if (!IS_ONSCREEN (x, y))
+ GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
if (GTK_WIDGET_REALIZED (myfixed))
gtk_widget_realize (widget);
+ gtk_widget_set_usize (widget, width, height);
+
if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
{
if (GTK_WIDGET_MAPPED (myfixed))
gtk_widget_map (widget);
- gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+ gtk_widget_queue_resize (widget);
}
}
void
gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y)
+ gint x,
+ gint y)
{
GtkMyFixedChild *child;
GList *children;
if (child->widget == widget)
{
- gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
+ if ((child->x == x) && (child->y == y))
+ break;
+
+ child->x = x;
+ child->y = y;
+
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
+ gtk_widget_queue_resize (widget);
break;
}
}
void
gtk_myfixed_resize (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 width,
- gint16 height)
+ gint width,
+ gint height)
{
GtkMyFixedChild *child;
GList *children;
if (child->widget == widget)
{
- gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
- break;
+ if ((child->width == width) && (child->height == height))
+ break;
+
+ child->width = width;
+ child->height = height;
+
+ gtk_widget_set_usize (widget, width, height);
+
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
+ gtk_widget_queue_resize (widget);
+ break;
}
}
}
void
gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget,
- gint16 x,
- gint16 y,
- gint16 width,
- gint16 height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GtkMyFixedChild *child;
GList *children;
child->y = y;
child->width = width;
child->height = height;
-
+
+ gtk_widget_set_usize (widget, width, height);
+
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
- {
- if ( (child->width > 1) &&
- (child->height > 1) &&
- !(GTK_WIDGET_REALIZED(widget) && GTK_IS_NOTEBOOK(widget)) )
- {
- child_allocation.x = child->x;
- child_allocation.y = child->y;
- child_allocation.width = MAX( child->width, 1 );
- child_allocation.height = MAX( child->height, 1 );
-
- /* work around for GTK bug when moving widgets outside
- the X window -> do NOT move them entirely outside */
- if (child_allocation.y + child_allocation.height < 0)
- child_allocation.y = -child_allocation.height;
- if (child_allocation.x + child_allocation.width < 0)
- child_allocation.x = -child_allocation.width;
-
- gtk_widget_size_allocate (widget, &child_allocation);
- }
- else
- {
- gtk_widget_queue_resize (GTK_WIDGET (myfixed));
- }
- }
+ gtk_widget_queue_resize (widget);
+
break;
}
}
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
+ if ( GTK_WIDGET_VISIBLE (child->widget) &&
+ !GTK_WIDGET_MAPPED (child->widget) &&
+ !GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ {
gtk_widget_map (child->widget);
+ }
}
gdk_window_show (widget->window);
+ gdk_window_show (myfixed->bin_window);
}
-#if (GTK_MINOR_VERSION == 0)
-static void
-gtk_myfixed_unmap (GtkWidget *widget)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (widget));
-
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-}
-#endif
-
static void
gtk_myfixed_realize (GtkWidget *widget)
{
GtkMyFixed *myfixed;
GdkWindowAttr attributes;
gint attributes_mask;
+ GtkMyFixedChild *child;
+ GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget));
attributes.window_type = GDK_WINDOW_CHILD;
-#if (GTK_MINOR_VERSION > 0)
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
attributes.width = widget->allocation.width;
attributes.height -= 4;
}
+ /* minimal size */
if (attributes.width < 2) attributes.width = 2;
if (attributes.height < 2) attributes.height = 2;
-#else
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = 32000;
- attributes.height = 32000;
-#endif
+
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask =
+ GDK_VISIBILITY_NOTIFY_MASK;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (widget->window, widget);
+
+ attributes.x = 0;
+ attributes.y = 0;
+
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |=
GDK_EXPOSURE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new( gtk_widget_get_parent_window (widget), &attributes,
- attributes_mask);
- gdk_window_set_user_data (widget->window, widget);
+ myfixed->bin_window = gdk_window_new (widget->window,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (myfixed->bin_window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, myfixed->bin_window, GTK_STATE_NORMAL);
+
+ /* add filters for intercepting visibility and expose events */
+ gdk_window_add_filter (widget->window, gtk_myfixed_main_filter, myfixed);
+ gdk_window_add_filter (myfixed->bin_window, gtk_myfixed_filter, myfixed);
+
+ /* we NEED gravity or we'll give up */
+ gravity_works = gdk_window_set_static_gravities (myfixed->bin_window, TRUE);
+
+ /* cannot be done before realisation */
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ gtk_widget_set_parent_window (child->widget, myfixed->bin_window);
+ }
+}
+
+static void
+gtk_myfixed_unrealize (GtkWidget *widget)
+{
+ GtkMyFixed *myfixed;
+
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (widget));
+
+ myfixed = GTK_MYFIXED (widget);
+
+ gdk_window_set_user_data (myfixed->bin_window, NULL);
+ gdk_window_destroy (myfixed->bin_window);
+ myfixed->bin_window = NULL;
+
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static void
{
GtkMyFixed *myfixed;
gint border;
+ gint x,y,w,h;
GtkMyFixedChild *child;
GtkAllocation child_allocation;
- GList *children;
+ GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED(widget));
myfixed = GTK_MYFIXED (widget);
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ gtk_myfixed_position_child (myfixed, child);
+ gtk_myfixed_allocate_child (myfixed, child);
+ }
+
widget->allocation = *allocation;
-#if (GTK_MINOR_VERSION > 0)
+
if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
border = 0;
else
border = 1;
else
border = 2;
-#else
- border = 0;
-#endif
+
+ x = allocation->x + border;
+ y = allocation->y + border;
+ w = allocation->width - border*2;
+ h = allocation->height - border*2;
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_move_resize( widget->window,
- allocation->x+border, allocation->y+border,
-#if (GTK_MINOR_VERSION > 0)
- allocation->width-border*2, allocation->height-border*2
-#else
- 32000, 32000
-#endif
- );
- }
-
- children = myfixed->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget))
- {
-/* please look at the text in wxWindow::DoSetSize() on why the
- test GTK_WIDGET_REALIZED() has to be here */
-/* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
- {
- gtk_widget_queue_resize( child->widget );
- }
- else */
- {
- child_allocation.x = child->x;
- child_allocation.y = child->y;
- child_allocation.width = MAX( child->width, 1 );
- child_allocation.height = MAX( child->height, 1 );
-
- /* work around for GTK bug when moving widgets outside
- the X window -> do NOT move them entirely outside */
- if (child_allocation.y + child_allocation.height < 0)
- child_allocation.y = -child_allocation.height;
- if (child_allocation.x + child_allocation.width < 0)
- child_allocation.x = -child_allocation.width;
-
- gtk_widget_size_allocate (child->widget, &child_allocation);
- }
- }
+ gdk_window_move_resize( widget->window, x, y, w, h );
+ gdk_window_move_resize( myfixed->bin_window, 0, 0, w, h );
}
}
static void
-gtk_myfixed_paint (GtkWidget *widget,
- GdkRectangle *area)
+gtk_myfixed_draw (GtkWidget *widget,
+ GdkRectangle *area)
{
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GdkRectangle child_area;
+ GList *children;
+
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget));
- g_return_if_fail (area != NULL);
- if (GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear_area (widget->window,
- area->x, area->y,
- area->width, area->height);
+ myfixed = GTK_MYFIXED (widget);
+
+ children = myfixed->children;
+ if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) )
+ {
+ gdk_window_clear_area( myfixed->bin_window,
+ area->x, area->y, area->width, area->height);
+ }
+
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ if (gtk_widget_intersect (child->widget, area, &child_area))
+ gtk_widget_draw (child->widget, &child_area);
+ }
}
+/*
static void
-gtk_myfixed_draw (GtkWidget *widget,
- GdkRectangle *area)
+gtk_myfixed_draw_border (GtkMyFixed *myfixed)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GdkRectangle child_area;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (widget));
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET(myfixed);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
+ return;
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_OUT)
{
- myfixed = GTK_MYFIXED (widget);
-
- children = myfixed->children;
- if (children) /* mini optimisation */
- gtk_myfixed_paint (widget, area);
-
- while (children)
- {
- child = children->data;
- children = children->next;
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height );
+ return;
+ }
- if (gtk_widget_intersect (child->widget, area, &child_area))
- gtk_widget_draw (child->widget, &child_area);
- }
+ if (myfixed->shadow_type == GTK_MYSHADOW_IN)
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height );
+ return;
+ }
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_THIN)
+ {
+ GdkGC *gc;
+ gc = gdk_gc_new( widget->window );
+ gdk_gc_set_foreground( gc, &widget->style->black );
+ gdk_draw_rectangle( widget->window, gc, FALSE,
+ 0, 0,
+ widget->allocation.width-1,
+ widget->allocation.height-1 );
+ gdk_gc_unref( gc );
+ return;
}
}
+*/
static gint
gtk_myfixed_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GdkEventExpose child_event;
- GList *children;
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GdkEventExpose child_event;
+ GList *children;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
+
+ myfixed = GTK_MYFIXED (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+/*
+ if (event->window == widget->window)
{
- myfixed = GTK_MYFIXED (widget);
+ gtk_myfixed_draw_border( myfixed );
+ return FALSE;
+ }
+*/
- child_event = *event;
+ if (event->window != myfixed->bin_window)
+ return FALSE;
- children = myfixed->children;
- while (children)
- {
- child = children->data;
- children = children->next;
+ children = myfixed->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- gtk_widget_intersect (child->widget, &event->area,
- &child_event.area))
+ child_event = *event;
+
+ if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+ GTK_WIDGET_DRAWABLE (child->widget) &&
+ gtk_widget_intersect (child->widget, &event->area, &child_event.area))
+ {
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
}
}
- return FALSE;
+ return FALSE;
}
static void
gtk_myfixed_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (container));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (container));
+ g_return_if_fail (widget != NULL);
- gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
+ gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
}
static void
gtk_myfixed_remove (GtkContainer *container,
- GtkWidget *widget)
+ GtkWidget *widget)
{
- GtkMyFixed *myfixed;
- GtkMyFixedChild *child;
- GList *children;
+ GtkMyFixed *myfixed;
+ GtkMyFixedChild *child;
+ GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_MYFIXED (container));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (container));
+ g_return_if_fail (widget != NULL);
- myfixed = GTK_MYFIXED (container);
+ myfixed = GTK_MYFIXED (container);
- children = myfixed->children;
- while (children)
+ children = myfixed->children;
+ while (children)
{
- child = children->data;
+ child = children->data;
- if (child->widget == widget)
+ if (child->widget == widget)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
-
- gtk_widget_unparent (widget);
+ gtk_widget_unparent (widget);
- /* security checks */
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ /* security checks */
+ g_return_if_fail (GTK_IS_WIDGET (widget));
- myfixed->children = g_list_remove_link (myfixed->children, children);
- g_list_free (children);
- g_free (child);
-
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ myfixed->children = g_list_remove_link (myfixed->children, children);
+ g_list_free (children);
+ g_free (child);
- /* security checks */
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- break;
+ /* security checks */
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
+
+ break;
}
- children = children->next;
+ children = children->next;
}
}
static void
-gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION > 0)
+gtk_myfixed_forall (GtkContainer *container,
gboolean include_internals,
-#endif
GtkCallback callback,
gpointer callback_data)
{
}
+/* Operations on children
+ */
+
+static void
+gtk_myfixed_position_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child)
+{
+ gint x;
+ gint y;
+
+ x = child->x - myfixed->xoffset;
+ y = child->y - myfixed->yoffset;
+
+ if (IS_ONSCREEN (x,y))
+ {
+ if (GTK_WIDGET_MAPPED (myfixed) &&
+ GTK_WIDGET_VISIBLE (child->widget))
+ {
+ if (!GTK_WIDGET_MAPPED (child->widget))
+ gtk_widget_map (child->widget);
+ }
+
+ if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
+ }
+ else
+ {
+ if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
+ GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
+
+ if (GTK_WIDGET_MAPPED (child->widget))
+ gtk_widget_unmap (child->widget);
+ }
+}
+
+static void
+gtk_myfixed_allocate_child (GtkMyFixed *myfixed,
+ GtkMyFixedChild *child)
+{
+ GtkAllocation allocation;
+ GtkRequisition requisition;
+
+ allocation.x = child->x - myfixed->xoffset;
+ allocation.y = child->y - myfixed->yoffset;
+ gtk_widget_get_child_requisition (child->widget, &requisition);
+ allocation.width = requisition.width;
+ allocation.height = requisition.height;
+
+ gtk_widget_size_allocate (child->widget, &allocation);
+}
+
+static void
+gtk_myfixed_position_children (GtkMyFixed *myfixed)
+{
+ GList *tmp_list;
+
+ tmp_list = myfixed->children;
+ while (tmp_list)
+ {
+ GtkMyFixedChild *child = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ gtk_myfixed_position_child (myfixed, child);
+ }
+}
+
+static void
+gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
+ gpointer cb_data)
+{
+ GtkMyFixedAdjData *data = cb_data;
+
+ widget->allocation.x += data->dx;
+ widget->allocation.y += data->dy;
+
+ if (GTK_WIDGET_NO_WINDOW (widget) &&
+ GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget),
+ gtk_myfixed_adjust_allocations_recurse,
+ cb_data);
+}
+
+static void
+gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed,
+ gint dx,
+ gint dy)
+{
+ GList *tmp_list;
+ GtkMyFixedAdjData data;
+
+ data.dx = dx;
+ data.dy = dy;
+
+ tmp_list = myfixed->children;
+ while (tmp_list)
+ {
+ GtkMyFixedChild *child = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ child->widget->allocation.x += dx;
+ child->widget->allocation.y += dy;
+
+ if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+ GTK_IS_CONTAINER (child->widget))
+ gtk_container_forall (GTK_CONTAINER (child->widget),
+ gtk_myfixed_adjust_allocations_recurse,
+ &data);
+ }
+}
+
+/* Callbacks */
+
+/* Send a synthetic expose event to the widget
+ */
+static void
+gtk_myfixed_expose_area (GtkMyFixed *myfixed,
+ gint x, gint y, gint width, gint height)
+{
+ if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
+ {
+ GdkEventExpose event;
+
+ event.type = GDK_EXPOSE;
+ event.send_event = TRUE;
+ event.window = myfixed->bin_window;
+ event.count = 0;
+
+ event.area.x = x;
+ event.area.y = y;
+ event.area.width = width;
+ event.area.height = height;
+
+ gdk_window_ref (event.window);
+ gtk_widget_event (GTK_WIDGET (myfixed), (GdkEvent *)&event);
+ gdk_window_unref (event.window);
+ }
+}
+
+/* This function is used to find events to process while scrolling
+ */
+
+static Bool
+gtk_myfixed_expose_predicate (Display *display,
+ XEvent *xevent,
+ XPointer arg)
+{
+ if ((xevent->type == Expose) ||
+ ((xevent->xany.window == *(Window *)arg) &&
+ (xevent->type == ConfigureNotify)))
+ return True;
+ else
+ return False;
+}
+
+/* This is the main routine to do the scrolling. Scrolling is
+ * done by "Guffaw" scrolling, as in the Mozilla XFE, with
+ * a few modifications.
+ *
+ * The main improvement is that we keep track of whether we
+ * are obscured or not. If not, we ignore the generated expose
+ * events and instead do the exposes ourself, without having
+ * to wait for a roundtrip to the server. This also provides
+ * a limited form of expose-event compression, since we do
+ * the affected area as one big chunk.
+ */
+
+void
+gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy)
+{
+ GtkWidget *widget;
+ XEvent xevent;
+
+ gint x,y,w,h,border;
+
+ widget = GTK_WIDGET (myfixed);
+
+ myfixed->xoffset += dx;
+ myfixed->yoffset += dy;
+
+ if (!GTK_WIDGET_MAPPED (myfixed))
+ {
+ gtk_myfixed_position_children (myfixed);
+ return;
+ }
+
+ gtk_myfixed_adjust_allocations (myfixed, -dx, -dy);
+
+ if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
+ border = 0;
+ else
+ if (myfixed->shadow_type == GTK_MYSHADOW_THIN)
+ border = 1;
+ else
+ border = 2;
+
+ x = 0;
+ y = 0;
+ w = widget->allocation.width - 2*border;
+ h = widget->allocation.height - 2*border;
+
+ if (dx > 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_resize (myfixed->bin_window,
+ w + dx,
+ h);
+ gdk_window_move (myfixed->bin_window, x-dx, y);
+ gdk_window_move_resize (myfixed->bin_window, x, y, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ MAX ((gint)w - dx, 0),
+ 0,
+ MIN (dx, w),
+ h);
+ }
+ else if (dx < 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_move_resize (myfixed->bin_window,
+ x + dx,
+ y,
+ w - dx,
+ h);
+ gdk_window_move (myfixed->bin_window, x, y);
+ gdk_window_resize (myfixed->bin_window, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ 0,
+ MIN (-dx, w),
+ h);
+ }
+
+ if (dy > 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_resize (myfixed->bin_window, w, h + dy);
+ gdk_window_move (myfixed->bin_window, x, y-dy);
+ gdk_window_move_resize (myfixed->bin_window,
+ x, y, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ MAX ((gint)h - dy, 0),
+ w,
+ MIN (dy, h));
+ }
+ else if (dy < 0)
+ {
+ if (gravity_works)
+ {
+ gdk_window_move_resize (myfixed->bin_window,
+ x, y+dy, w, h - dy );
+ gdk_window_move (myfixed->bin_window, x, y);
+ gdk_window_resize (myfixed->bin_window, w, h );
+ }
+ else
+ {
+ /* FIXME */
+ }
+ gtk_myfixed_expose_area (myfixed,
+ 0,
+ 0,
+ w,
+ MIN (-dy, (gint)h));
+ }
+
+ gtk_myfixed_position_children (myfixed);
+
+ /* We have to make sure that all exposes from this scroll get
+ * processed before we scroll again, or the expose events will
+ * have invalid coordinates.
+ *
+ * We also do expose events for other windows, since otherwise
+ * their updating will fall behind the scrolling
+ *
+ * This also avoids a problem in pre-1.0 GTK where filters don't
+ * have access to configure events that were compressed.
+ */
+
+ gdk_flush();
+ while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (myfixed->bin_window),
+ &xevent,
+ gtk_myfixed_expose_predicate,
+ (XPointer)&GDK_WINDOW_XWINDOW (myfixed->bin_window)))
+ {
+ GdkEvent event;
+ GtkWidget *event_widget;
+
+ if ((xevent.xany.window == GDK_WINDOW_XWINDOW (myfixed->bin_window)) &&
+ (gtk_myfixed_filter (&xevent, &event, myfixed) == GDK_FILTER_REMOVE))
+ continue;
+
+ if (xevent.type == Expose)
+ {
+ event.expose.window = gdk_window_lookup (xevent.xany.window);
+ gdk_window_get_user_data (event.expose.window,
+ (gpointer *)&event_widget);
+
+ if (event_widget)
+ {
+ event.expose.type = GDK_EXPOSE;
+ event.expose.area.x = xevent.xexpose.x;
+ event.expose.area.y = xevent.xexpose.y;
+ event.expose.area.width = xevent.xexpose.width;
+ event.expose.area.height = xevent.xexpose.height;
+ event.expose.count = xevent.xexpose.count;
+
+ gdk_window_ref (event.expose.window);
+ gtk_widget_event (event_widget, &event);
+ gdk_window_unref (event.expose.window);
+ }
+ }
+ }
+}
+
+/* The main event filter. Actually, we probably don't really need
+ * to install this as a filter at all, since we are calling it
+ * directly above in the expose-handling hack. But in case scrollbars
+ * are fixed up in some manner...
+ *
+ * This routine identifies expose events that are generated when
+ * we've temporarily moved the bin_window_origin, and translates
+ * them or discards them, depending on whether we are obscured
+ * or not.
+ */
+static GdkFilterReturn
+gtk_myfixed_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data)
+{
+ XEvent *xevent;
+ GtkMyFixed *myfixed;
+
+ xevent = (XEvent *)gdk_xevent;
+ myfixed = GTK_MYFIXED (data);
+
+ switch (xevent->type)
+ {
+ case Expose:
+ if (xevent->xexpose.serial == myfixed->configure_serial)
+ {
+ if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
+ return GDK_FILTER_REMOVE;
+ else
+ {
+ xevent->xexpose.x += myfixed->scroll_x;
+ xevent->xexpose.y += myfixed->scroll_y;
+
+ break;
+ }
+ }
+ break;
+
+ case ConfigureNotify:
+ if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
+ {
+ myfixed->configure_serial = xevent->xconfigure.serial;
+ myfixed->scroll_x = xevent->xconfigure.x;
+ myfixed->scroll_y = xevent->xconfigure.y;
+ }
+ break;
+ }
+
+ return GDK_FILTER_CONTINUE;
+}
+
+/* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
+ * there is no corresponding event in GTK, so we have
+ * to get the events from a filter
+ */
+static GdkFilterReturn
+gtk_myfixed_main_filter (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data)
+{
+ XEvent *xevent;
+ GtkMyFixed *myfixed;
+
+ xevent = (XEvent *)gdk_xevent;
+ myfixed = GTK_MYFIXED (data);
+
+ if (xevent->type == VisibilityNotify)
+ {
+ switch (xevent->xvisibility.state)
+ {
+ case VisibilityFullyObscured:
+ myfixed->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
+ break;
+
+ case VisibilityPartiallyObscured:
+ myfixed->visibility = GDK_VISIBILITY_PARTIAL;
+ break;
+
+ case VisibilityUnobscured:
+ myfixed->visibility = GDK_VISIBILITY_UNOBSCURED;
+ break;
+ }
+
+ return GDK_FILTER_REMOVE;
+ }
+
+
+ return GDK_FILTER_CONTINUE;
+}
+
+
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
+//-----------------------------------------------------------------------------
+// local code (see below)
+//-----------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION > 0)
+
+static void draw_frame( GtkWidget *widget, wxWindow *win )
+{
+ if (!win->m_hasVMT)
+ return;
+
+ int dw = 0;
+ int dh = 0;
+
+ if (win->HasScrolling())
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
+
+/*
+ GtkWidget *hscrollbar = scroll_window->hscrollbar;
+ GtkWidget *vscrollbar = scroll_window->vscrollbar;
+
+ we use this instead: range.slider_width = 11 + 2*2pts edge
+*/
+
+ if (scroll_window->vscrollbar_visible)
+ {
+ dw += 15; /* dw += vscrollbar->allocation.width; */
+ dw += scroll_class->scrollbar_spacing;
+ }
+
+ if (scroll_window->hscrollbar_visible)
+ {
+ dh += 15; /* dh += hscrollbar->allocation.height; */
+ dh += scroll_class->scrollbar_spacing;
+ }
+ }
+
+ int dx = 0;
+ int dy = 0;
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ {
+ dx += widget->allocation.x;
+ dy += widget->allocation.y;
+ }
+
+ if (win->HasFlag(wxRAISED_BORDER))
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ dx, dy,
+ win->m_width-dw, win->m_height-dh );
+ return;
+ }
+
+ if (win->HasFlag(wxSUNKEN_BORDER))
+ {
+ gtk_draw_shadow( widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ dx, dy,
+ win->m_width-dw, win->m_height-dh );
+ return;
+ }
+
+ if (win->HasFlag(wxSIMPLE_BORDER))
+ {
+ GdkGC *gc;
+ gc = gdk_gc_new( widget->window );
+ gdk_gc_set_foreground( gc, &widget->style->black );
+ gdk_draw_rectangle( widget->window, gc, FALSE,
+ dx, dy,
+ win->m_width-dw-1, win->m_height-dh-1 );
+ gdk_gc_unref( gc );
+ return;
+ }
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" of m_widget
+//-----------------------------------------------------------------------------
+
+static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
+{
+ if (gdk_event->count > 0) return;
+ draw_frame( widget, win );
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
+{
+ draw_frame( widget, win );
+}
+
+#endif // GTK_MINOR_VERSION > 0
+
//-----------------------------------------------------------------------------
// key event conversion routines
//-----------------------------------------------------------------------------
return (key_code);
}
-//-----------------------------------------------------------------------------
-// local code (see below)
-//-----------------------------------------------------------------------------
-
-#if (GTK_MINOR_VERSION > 0)
-
-static void draw_frame( GtkWidget *widget, wxWindow *win )
-{
- if (!win->m_hasVMT)
- return;
-
- int dw = 0;
- int dh = 0;
-
- if (win->HasScrolling())
- {
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
-
-/*
- GtkWidget *hscrollbar = scroll_window->hscrollbar;
- GtkWidget *vscrollbar = scroll_window->vscrollbar;
-
- we use this instead: range.slider_width = 11 + 2*2pts edge
-*/
-
- if (scroll_window->vscrollbar_visible)
- {
- dw += 15; /* dw += vscrollbar->allocation.width; */
- dw += scroll_class->scrollbar_spacing;
- }
-
- if (scroll_window->hscrollbar_visible)
- {
- dh += 15; /* dh += hscrollbar->allocation.height; */
- dh += scroll_class->scrollbar_spacing;
- }
- }
-
- int dx = 0;
- int dy = 0;
- if (GTK_WIDGET_NO_WINDOW (widget))
- {
- dx += widget->allocation.x;
- dy += widget->allocation.y;
- }
-
- if (win->HasFlag(wxRAISED_BORDER))
- {
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- dx, dy,
- win->m_width-dw, win->m_height-dh );
- return;
- }
-
- if (win->HasFlag(wxSUNKEN_BORDER))
- {
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_IN,
- dx, dy,
- win->m_width-dw, win->m_height-dh );
- return;
- }
-
- if (win->HasFlag(wxSIMPLE_BORDER))
- {
- GdkGC *gc = gdk_gc_new( widget->window );
- gdk_gc_set_foreground( gc, &widget->style->black );
- gdk_draw_rectangle( widget->window, gc, FALSE,
- dx, dy,
- win->m_width-dw-1, win->m_height-dh-1 );
- gdk_gc_unref( gc );
- return;
- }
-}
-
-//-----------------------------------------------------------------------------
-// "expose_event" of m_widget
-//-----------------------------------------------------------------------------
-
-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
-{
- if (gdk_event->count > 0) return;
- draw_frame( widget, win );
-}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
-{
- draw_frame( widget, win );
-}
-
-#endif // GTK_MINOR_VERSION > 0
-
//-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow
//-----------------------------------------------------------------------------
if (!win->m_hasVMT)
return;
- if (gdk_event->window != win->m_wxwindow->window)
- return;
-
win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
gdk_event->area.width,
if (!win->m_hasVMT)
return;
- GtkMyFixed *myfixed = GTK_MYFIXED (widget);
- if (!myfixed->children)
- return; /* mini optimisation */
-
win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height );
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
#if (GTK_MINOR_VERSION > 0)
- /* these are called when the "sunken", "raised" or "simple" borders are drawn */
+ /* these are called when the "sunken" or "raised" borders are drawn */
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
if (m_wxwindow)
{
- GdkWindow *window = m_wxwindow->window;
+ GdkWindow *window = GTK_MYFIXED(m_wxwindow)->bin_window;
if (window)
gdk_window_set_cursor( window, cursor.GetCursor() );
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = GTK_MYFIXED(m_wxwindow)->bin_window;
else
source = m_widget->window;
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = GTK_MYFIXED(m_wxwindow)->bin_window;
else
source = m_widget->window;
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (connect_widget->window)
- {
- /* we provide this function ourselves as it is
- missing in GDK */
- gdk_window_warp_pointer( connect_widget->window, x, y );
- }
+ /* we provide this function ourselves as it is
+ missing in GDK (top of this file) */
+
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (window)
+ gdk_window_warp_pointer( window, x, y );
}
void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
{
if (rect)
{
- gdk_window_clear_area( m_wxwindow->window,
+ gdk_window_clear_area( GTK_MYFIXED(m_wxwindow)->bin_window,
rect->x, rect->y,
rect->width, rect->height );
}
else
{
- gdk_window_clear( m_wxwindow->window );
+ gdk_window_clear( GTK_MYFIXED(m_wxwindow)->bin_window );
}
}
if (!m_delayedBackgroundColour) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
return TRUE;
}
- if (m_wxwindow && m_wxwindow->window)
+ if (m_wxwindow)
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_wxwindow->window ) );
- gdk_window_set_background( m_wxwindow->window, m_backgroundColour.GetColor() );
+ m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+ gdk_window_set_background( window, m_backgroundColour.GetColor() );
}
wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
if (!m_delayedForegroundColour) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
{
- if (m_wxwindow) return (window == m_wxwindow->window);
+ if (m_wxwindow)
+ return (window == GTK_MYFIXED(m_wxwindow)->bin_window);
+
return (window == m_widget->window);
}
if (!m_delayedFont) return FALSE;
}
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window)
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window)
{
// indicate that a new style has been set
// but it couldn't get applied as the
wxCHECK_RET( g_captureWindow == NULL, wxT("CaptureMouse called twice") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window) return;
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window) return;
- gdk_pointer_grab( connect_widget->window, FALSE,
+ gdk_pointer_grab( window, FALSE,
(GdkEventMask)
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
wxCHECK_RET( g_captureWindow, wxT("ReleaseMouse called twice") );
- GtkWidget *connect_widget = GetConnectWidget();
- if (!connect_widget->window) return;
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_MYFIXED(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
+
+ if (!window) return;
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
g_captureWindow = (wxWindow*) NULL;
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
+ gtk_myfixed_scroll( GTK_MYFIXED(m_wxwindow), -dx, -dy );
+
+/*
if (!m_scrollGC)
{
m_scrollGC = gdk_gc_new( m_wxwindow->window );
Refresh( TRUE, &rect );
}
+*/
}
void wxWindow::SetScrolling(bool scroll)
c = c -> GetParent();
}
+/*
((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty);
-
m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy - HTML_SCROLL_STEP * sty, m_Width, m_Height);
-// m_Wnd -> Refresh();
+*/
+
+ m_Wnd -> SetSize(absx, absy, m_Width, m_Height);
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
absy += c -> GetPosY();
c = c -> GetParent();
}
+
+/*
((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty);
-
m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy - HTML_SCROLL_STEP * sty, m_Width, m_Height);
+*/
+
+ m_Wnd -> SetSize(absx, absy, m_Width, m_Height);
+
wxHtmlCell::DrawInvisible(dc, x, y);
}
projects / wxWidgets.git / commitdiff
