corrected off by 1 error in cMB2WC() call (thanks valgrind)

[wxWidgets.git] / src / gtk / popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 2de47c76c0d304eab492cb0e81125201bec860d2..6e1048917c52c379693deaeae089a70afa2ebf3d 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -20,11 +20,8 @@
     #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
     #include "wx/cursor.h"
 #endif // WX_PRECOMP
 

-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>

 
 

-#include "wx/gtk/private.h" //for idle stuff

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------


@@ -72,9 +69,6 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
 extern "C" {
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
 {
 extern "C" {
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     if (win->IsEnabled())
         win->Close();
 
     if (win->IsEnabled())
         win->Close();
 


@@ -93,9 +87,6 @@ extern "C" {
 static gint
 gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 {
 static gint
 gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;


@@ -119,10 +110,10 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 

-static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
+static void wxInsertChildInPopupWin(wxWindowGTK* parent, wxWindowGTK* child)

 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),

-                   GTK_WIDGET(child->m_widget),
+                   child->m_widget,

                    child->m_x,
                    child->m_y,
                    child->m_width,
                    child->m_x,
                    child->m_y,
                    child->m_width,


@@ -152,7 +143,7 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {

-    m_needParent = false;
+    m_sizeSet = false;

 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))


@@ -167,7 +158,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 

-    m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+    m_insertCallback = wxInsertChildInPopupWin;

 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
 
 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
 


@@ -248,15 +239,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     }
 */
 
     }
 */
 

-    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 != -1) || (m_y != -1))
     {