#include "wx/dnd.h"
#include "wx/mdi.h"
#include "wx/notebook.h"
+#include "wx/statusbr.h"
+//#include "wx/treectrl.h"
#include "gdk/gdkkeysyms.h"
#include <math.h>
#include "wx/gtk/win_gtk.h"
if (g_blockEventsOnDrag) return;
/*
- printf( "OnExpose from " );
+ if (IS_KIND_OF(win,wxTreeCtrl))
+ {
+ printf( "OnExpose from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
printf( ".\n" );
printf( "y: %d \n", gdk_event->area.y );
printf( "w: %d \n", gdk_event->area.width );
printf( "h: %d \n", gdk_event->area.height );
+}
*/
win->m_updateRegion.Union( gdk_event->area.x,
event.m_x = 0;
event.m_y = 0;
event.SetEventObject( win );
- return win->ProcessEvent( event );
+
+ bool ret = win->ProcessEvent( event );
+/*
+ if (ret) printf( "found.\n") ;
+*/
+ return ret;
};
//-----------------------------------------------------------------------------
gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
{
- if (widget->window != gdk_event->window) return FALSE;
- if (g_blockEventsOnDrag) return FALSE;
+ if (widget->window != gdk_event->window) return TRUE;
+ if (g_blockEventsOnDrag) return TRUE;
if (win->m_wxwindow)
{
};
};
- if (!win->HasVMT()) return FALSE;
+ if (!win->HasVMT()) return TRUE;
/*
printf( "OnButtonPress from " );
{
if (widget->window != gdk_event->window) return TRUE;
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_blockEventsOnDrag) return TRUE;
- if (!win->HasVMT()) return FALSE;
+ if (!win->HasVMT()) return TRUE;
/*
printf( "OnButtonRelease from " );
event.m_y = (long)gdk_event->y;
event.SetEventObject( win );
- return win->ProcessEvent( event );
+ win->ProcessEvent( event );
+
+ return TRUE;
};
//-----------------------------------------------------------------------------
{
if (widget->window != gdk_event->window) return TRUE;
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_blockEventsOnDrag) return TRUE;
- if (!win->HasVMT()) return FALSE;
+ if (!win->HasVMT()) return TRUE;
/*
printf( "OnMotion from " );
win->ProcessEvent( event );
- return FALSE;
+ return TRUE;
};
//-----------------------------------------------------------------------------
gint gtk_window_focus_in_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win )
{
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_blockEventsOnDrag) return TRUE;
if (win->m_wxwindow)
{
if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
};
};
- if (!win->HasVMT()) return FALSE;
+ if (!win->HasVMT()) return TRUE;
/*
printf( "OnSetFocus from " );
wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
event.SetEventObject( win );
- return win->ProcessEvent( event );
+ win->ProcessEvent( event );
+
+ return TRUE;
};
//-----------------------------------------------------------------------------
gint gtk_window_focus_out_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win )
{
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_blockEventsOnDrag) return TRUE;
if (win->m_wxwindow)
{
if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS);
};
- if (!win->HasVMT()) return FALSE;
+ if (!win->HasVMT()) return TRUE;
/*
printf( "OnKillFocus from " );
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win );
- return win->ProcessEvent( event );
+ win->ProcessEvent( event );
+
+ return TRUE;
};
//-----------------------------------------------------------------------------
void gtk_window_drop_callback( GtkWidget *widget, GdkEvent *event, wxWindow *win )
{
- printf( "OnDrop.\n" );
-
+ if (!win->HasVMT()) return;
+
if (win->GetDropTarget())
{
int x = 0;
bool gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
{
if (widget->window != gdk_event->window) return TRUE;
-
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_blockEventsOnDrag) return TRUE;
+ if (!win->HasVMT()) return TRUE;
if (widget->window)
gdk_window_set_cursor( widget->window, win->m_cursor->GetCursor() );
bool gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
{
if (widget->window != gdk_event->window) return TRUE;
-
- if (g_blockEventsOnDrag) return FALSE;
+ if (!win->HasVMT()) return TRUE;
+ if (g_blockEventsOnDrag) return TRUE;
if (widget->window)
gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() );
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
+ m_cursor = NULL;
Create( parent, id, pos, size, style, name );
};
m_wxwindow = gtk_myfixed_new();
+ if (m_wxwindow) GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+
if (m_windowStyle & wxTAB_TRAVERSAL == wxTAB_TRAVERSAL)
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
else
if (m_widget) gtk_widget_destroy( m_widget );
-// delete m_cursor;
+ wxDELETE(m_cursor);
DeleteRelatedConstraints();
if (m_constraints)
m_windowValidator = NULL;
m_windowId = id;
m_sizeSet = FALSE;
- m_cursor = new wxCursor( wxCURSOR_ARROW );
+ if (m_cursor == NULL)
+ m_cursor = new wxCursor( wxCURSOR_ARROW );
m_font = *wxSWISS_FONT;
m_backgroundColour = wxWHITE;
m_foregroundColour = wxBLACK;
gtk_signal_connect( GTK_OBJECT(connect_widget), "focus_out_event",
GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(connect_widget), "drop_data_available_event",
- GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
-
// Only for cursor handling
gtk_signal_connect( GTK_OBJECT(m_widget), "enter_notify_event",
void wxWindow::ImplementSetPosition(void)
{
- if (!m_parent)
+ if (IS_KIND_OF(this,wxFrame) || IS_KIND_OF(this,wxDialog))
{
- if (IsKindOf(CLASSINFO(wxFrame)) ||
- IsKindOf(CLASSINFO(wxDialog)))
- {
+ if ((m_x != -1) || (m_y != -1))
gtk_widget_set_uposition( m_widget, m_x, m_y );
- }
- else
- {
- printf( "wxWindow::SetSize error.\n" );
- }
+ return;
+ }
+
+ if (!m_parent)
+ {
+ printf( "wxWindow::SetSize error.\n" );
return;
}
void wxWindow::Centre( int direction )
{
- int x = 0;
- int y = 0;
- GetPosition( &x, &y );
- if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
+ if (IS_KIND_OF(this,wxDialog) || IS_KIND_OF(this,wxFrame))
{
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
- gtk_widget_set_uposition( m_widget, x, y );
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
+ ImplementSetPosition();
}
else
{
int p_w = 0;
int p_h = 0;
m_parent->GetSize( &p_w, &p_h );
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
- gtk_widget_set_uposition( m_widget, x, y );
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (p_w - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) m_y = (p_h - m_height) / 2;
+ ImplementSetPosition();
};
}
};
node = node->Next();
}
- SetClientSize(maxX + 5, maxY + 5);
+ SetClientSize(maxX + 5, maxY + 10);
};
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
// wxFrame and wxDialog as children aren't placed into the parents
- if (child->IsKindOf(CLASSINFO(wxFrame)) || child->IsKindOf(CLASSINFO(wxDialog)))
+ if (( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog) ) &&
+ (!IS_KIND_OF(child,wxMDIChildFrame)))
{
m_children.Append( child );
// In the case of an wxMDIChildFrame descendant, we use the
// client windows's AddChild()
- if (IsKindOf(CLASSINFO(wxMDIParentFrame)))
+ if (IS_KIND_OF(this,wxMDIParentFrame))
{
- if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
+ if (IS_KIND_OF(child,wxMDIChildFrame))
{
wxMDIClientWindow *client = ((wxMDIParentFrame*)this)->GetClientWindow();
if (client)
// wxNotebook is very special, so it has a private AddChild()
- if (IsKindOf(CLASSINFO(wxNotebook)))
+ if (IS_KIND_OF(this,wxNotebook))
{
wxNotebook *tab = (wxNotebook*)this;
tab->AddChild( child );
// wxFrame has a private AddChild
- if (IsKindOf(CLASSINFO(wxFrame)))
+ if (IS_KIND_OF(this,wxFrame) && !IS_KIND_OF(this,wxMDIChildFrame))
{
wxFrame *frame = (wxFrame*)this;
frame->AddChild( child );
// All the rest
m_children.Append( child );
- if (m_wxwindow) gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
+ if (m_wxwindow) gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget,
+ child->m_x, child->m_y );
+
gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
};
void wxWindow::SetCursor( const wxCursor &cursor )
{
- if (*m_cursor == cursor) return;
+ wxASSERT(m_cursor != NULL);
+
+ if (m_cursor != NULL)
+ if (*m_cursor == cursor)
+ return;
(*m_cursor) = cursor;
if (m_widget->window)
gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
if (rect)
gdk_window_clear_area( m_wxwindow->window,
rect->x,
- rect->y,
- rect->width,
- rect->height );
+ rect->y,
+ rect->width,
+ rect->height );
else
Clear();
};
gdk_rect.y = rect->y;
gdk_rect.width = rect->width;
gdk_rect.height = rect->height;
+
if (m_wxwindow)
gtk_widget_draw( m_wxwindow, &gdk_rect );
else
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
- GtkWidget *connect_widget = m_widget;
- if (m_wxwindow) connect_widget = m_wxwindow;
+ GtkWidget *dnd_widget = GetDropTargetWidget();
+
if (m_pDropTarget)
{
- m_pDropTarget->UnregisterWidget( connect_widget );
+ gtk_signal_disconnect_by_func( GTK_OBJECT(dnd_widget),
+ GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
+
+ m_pDropTarget->UnregisterWidget( dnd_widget );
delete m_pDropTarget;
};
m_pDropTarget = dropTarget;
if (m_pDropTarget)
{
- m_pDropTarget->RegisterWidget( connect_widget );
+ m_pDropTarget->RegisterWidget( dnd_widget );
+
+ gtk_signal_connect( GTK_OBJECT(dnd_widget), "drop_data_available_event",
+ GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
};
};
return m_pDropTarget;
};
+GtkWidget* wxWindow::GetDropTargetWidget(void)
+{
+ GtkWidget *connect_widget = m_widget;
+ if (m_wxwindow) connect_widget = m_wxwindow;
+
+ return connect_widget;
+}
+
void wxWindow::SetFont( const wxFont &font )
{
m_font = font;
};
if (m_wxwindow->window)
- {
+ {
if (orient == wxHORIZONTAL)
+ {
+/*
+ m_drawingOffsetX = -16000;
+
+ gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY );
+*/
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
- else
+ }
+ else
+ {
+/*
+ m_drawingOffsetY = -16000;
+
+ gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY );
+*/
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+ }
gtk_widget_set_usize( m_widget, m_width, m_height );
};
{
if (!m_wxwindow) return;
- m_drawingOffsetX += dx;
- m_drawingOffsetY += dy;
+ bool refresh = FALSE;
+
+ if ((m_drawingOffsetX == 0) && (m_drawingOffsetY == 0))
+ {
+ m_drawingOffsetX = -16000;
+ m_drawingOffsetY = -16000;
+ refresh = TRUE;
+ }
+ else
+ {
+ m_drawingOffsetX += dx;
+ m_drawingOffsetY += dy;
+ }
// printf( "X: %d Y: %d \n", (int)m_drawingOffsetX, (int)m_drawingOffsetY );
gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY );
+ if (refresh) Refresh();
+
/*
The code here is very nifty, but it doesn't work with
overlapping windows...
return IsEnabled() && IsShown();
}
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindow::OnIdle(wxIdleEvent& WXUNUSED(event) )
{
UpdateWindowUI();
}
projects / wxWidgets.git / blobdiff