fix MSVC warnings about possibly uninitialized variables; some reindentation

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

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index f2d3a67520304210d8d779717a000cebf309edf8..908baae4045edb8ed3effdf7b3aa6f8afa04eaa8 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/gtk1/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,25 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "popupwin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -53,9 +52,9 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
     if (child != widget)
     {
         while (child)
-           {
-               if (child == widget)
-                   return FALSE;
+        {
+            if (child == widget)
+                return FALSE;
             child = child->parent;
         }
     }
@@ -63,7 +62,7 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
     wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
     event.SetEventObject( win );
 
-    (void)win->GetEventHandler()->ProcessEvent( event );
+    (void)win->HandleWindowEvent( event );
 
     return TRUE;
 }
@@ -142,11 +141,11 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
-                     GTK_WIDGET(child->m_widget),
-                     child->m_x,
-                     child->m_y,
-                     child->m_width,
-                     child->m_height );
+                   GTK_WIDGET(child->m_widget),
+                   child->m_x,
+                   child->m_y,
+                   child->m_width,
+                   child->m_height );
 
     if (parent->HasFlag(wxTAB_TRAVERSAL))
     {
@@ -172,15 +171,18 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
-    m_needParent = FALSE;
+    m_needParent = false;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;
+
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 
@@ -217,8 +219,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
 
     gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
         GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );
-        
-    return TRUE;
+
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
@@ -232,7 +234,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
+    m_resizing = true;
 
     int old_x = m_x;
     int old_y = m_y;
@@ -293,11 +295,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
 
         /* actual resizing is deferred to GtkOnSize in idle time and
            when showing the dialog */
-        m_sizeSet = FALSE;
+        m_sizeSet = false;
 
     }
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -326,16 +328,16 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
     geom.max_width = m_width;
     geom.max_height = m_height;
     gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
-                                   (GtkWidget*) NULL,
+                                   NULL,
                                    &geom,
                                    (GdkWindowHints) flag );
 
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
+    HandleWindowEvent( event );
 }
 
 void wxPopupWindow::OnInternalIdle()
@@ -357,9 +359,9 @@ bool wxPopupWindow::Show( bool show )
 
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
-    
+
     bool ret = wxWindow::Show( show );
-    
+
     return ret;
 }