#include "wx/popupwin.h"
#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/frame.h"
- #include "wx/cursor.h"
#endif // WX_PRECOMP
#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private/win_gtk.h"
//-----------------------------------------------------------------------------
// "button_press"
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win );
- (void)win->GetEventHandler()->ProcessEvent( event );
+ (void)win->HandleWindowEvent( event );
return TRUE;
}
}
}
-//-----------------------------------------------------------------------------
-// InsertChild for wxPopupWindow
-//-----------------------------------------------------------------------------
-
-/* Callback for wxFrame. This very strange beast has to be used because
- * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWidgets requires different ways to insert
- * a child in container classes. */
-
-static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
+void wxPopupWindow::AddChildGTK(wxWindowGTK* child)
{
- gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
- child->m_widget,
- child->m_x,
- child->m_y,
- child->m_width,
- child->m_height );
-
- if (parent->HasFlag(wxTAB_TRAVERSAL))
+ gtk_widget_set_size_request(
+ child->m_widget, child->m_width, child->m_height);
+ gtk_fixed_put(
+ GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y);
+
+ if (HasFlag(wxTAB_TRAVERSAL))
{
/* we now allow a window to get the focus as long as it
doesn't have any children. */
- GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
+ GTK_WIDGET_UNSET_FLAGS(m_wxwindow, GTK_CAN_FOCUS);
}
}
// wxPopupWindow
//-----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
#ifdef __WXUNIVERSAL__
+BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
EVT_SIZE(wxPopupWindow::OnSize)
-#endif
END_EVENT_TABLE()
+#endif
wxPopupWindow::~wxPopupWindow()
{
bool wxPopupWindow::Create( wxWindow *parent, int style )
{
- m_needParent = false;
-
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
{
// All dialogs should really have this style
m_windowStyle |= wxTAB_TRAVERSAL;
- m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
-
m_widget = gtk_window_new( GTK_WINDOW_POPUP );
+ g_object_ref(m_widget);
if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget)))
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
g_signal_connect (m_widget, "delete_event",
G_CALLBACK (gtk_dialog_delete_callback), this);
- m_wxwindow = gtk_pizza_new();
+ m_wxwindow = wxPizza::New(m_windowStyle);
gtk_widget_show( m_wxwindow );
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
- if (m_resizing) return; /* I don't like recursions */
- m_resizing = true;
-
int old_x = m_x;
int old_y = m_y;
int old_width = m_width;
int old_height = m_height;
- if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
- {
- if (x != -1) m_x = x;
- if (y != -1) m_y = y;
- if (width != -1) m_width = width;
- if (height != -1) m_height = height;
- }
- else
- {
+ if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_x = x;
+ if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_y = y;
+ if (width != -1)
m_width = width;
+ if (height != -1)
m_height = height;
- }
-
-/*
- if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
- {
- if (width == -1) m_width = 80;
- }
-
- if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
- {
- if (height == -1) m_height = 26;
- }
-*/
- int minWidth = GetMinWidth(),
- minHeight = GetMinHeight(),
- maxWidth = GetMaxWidth(),
- maxHeight = GetMaxHeight();
-
- if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
- if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
- if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
- if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
+ ConstrainSize();
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
{
- /* we set the position here and when showing the dialog
- for the first time in idle time */
- // Where does that happen in idle time? I do not see it anywhere - MR
gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
}
}
if ((m_width != old_width) || (m_height != old_height))
{
+ // gtk_window_resize does not work for GTK_WINDOW_POPUP
gtk_widget_set_size_request( m_widget, m_width, m_height );
-
- /* actual resizing is deferred to GtkOnSize in idle time and
- when showing the dialog */
- m_sizeSet = false;
-
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
}
-
- m_resizing = false;
-}
-
-void wxPopupWindow::GtkOnSize()
-{
- if (m_sizeSet) return;
- if (!m_wxwindow) return;
-
- /* FIXME: is this a hack? */
- /* Since for some reason GTK will revert to using maximum size ever set
- for this window, we have to set geometry hints maxsize to match size
- given. Also set the to that minsize since resizing isn't possible
- anyway. */
-
- /* set size hints */
- gint flag = GDK_HINT_MAX_SIZE | GDK_HINT_MIN_SIZE; // GDK_HINT_POS;
- GdkGeometry geom;
- geom.min_width = m_width;
- geom.min_height = m_height;
- geom.max_width = m_width;
- geom.max_height = m_height;
- gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
- (GtkWidget*) NULL,
- &geom,
- (GdkWindowHints) flag );
-
-
- m_sizeSet = true;
-
- wxSizeEvent event( wxSize(m_width,m_height), GetId() );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
-}
-
-void wxPopupWindow::OnInternalIdle()
-{
- if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
- GtkOnSize();
-
- wxWindow::OnInternalIdle();
}
bool wxPopupWindow::Show( bool show )
{
- if (show && !m_sizeSet)
+ if (show && !IsShown())
{
- /* by calling GtkOnSize here, we don't have to call
- either after showing the frame, which would entail
- much ugly flicker nor from within the size_allocate
- handler, because GTK 1.1.X forbids that. */
-
- GtkOnSize();
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
}
bool ret = wxWindow::Show( show );
projects / wxWidgets.git / blobdiff