fixed obscure compilation problem at line 139

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index cec606e52e67d6ef19fac466ea90643243dfcda0..914fce2d2601fe0f133a986dc880a9135f55624e 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "popupwinbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -67,7 +63,6 @@ class wxPopupWindowHandler : public wxEvtHandler
 {
 public:
     wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
 {
 public:
     wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

-    ~wxPopupWindowHandler();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -84,7 +79,6 @@ class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
     wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
 {
 public:
     wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

-    ~wxPopupFocusHandler();

 
 protected:
     void OnKillFocus(wxFocusEvent& event);
 
 protected:
     void OnKillFocus(wxFocusEvent& event);


@@ -194,7 +188,7 @@ wxPopupTransientWindow::~wxPopupTransientWindow()
 {
     if (m_handlerPopup && m_handlerPopup->GetNextHandler())
         PopHandlers();
 {
     if (m_handlerPopup && m_handlerPopup->GetNextHandler())
         PopHandlers();

-        
+

     wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
     wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 
     wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
     wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 


@@ -213,7 +207,7 @@ void wxPopupTransientWindow::PopHandlers()
             m_handlerPopup = NULL;
         }
         if (m_child->HasCapture())
             m_handlerPopup = NULL;
         }
         if (m_child->HasCapture())

-        {       
+        {

             m_child->ReleaseMouse();
         }
         m_child = NULL;
             m_child->ReleaseMouse();
         }
         m_child = NULL;


@@ -261,7 +255,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();

-#elif __WXGTK__
+#elif defined(__WXGTK__)

     // GTK+ catches the activate events from the popup
     // window, not the focus events from the child window
     m_focus = this;
     // GTK+ catches the activate events from the popup
     // window, not the focus events from the child window
     m_focus = this;


@@ -274,16 +268,6 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
         m_focus->PushEventHandler(m_handlerFocus);
     }
 
         m_focus->PushEventHandler(m_handlerFocus);
     }

-
-    // catch destroy events, if you close a program with a popup shown in MSW
-    // you get a segfault if m_child or m_focus are deleted before this is
-    m_child->Connect(wxEVT_DESTROY,
-                     wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                     NULL, this);
-    if (m_focus)
-        m_focus->Connect(wxEVT_DESTROY,
-                         wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                         NULL, this);

 }
 
 bool wxPopupTransientWindow::Show( bool show )
 }
 
 bool wxPopupTransientWindow::Show( bool show )


@@ -306,11 +290,11 @@ bool wxPopupTransientWindow::Show( bool show )
 
 #ifdef __WXMSW__
     if (!show && m_child && m_child->HasCapture())
 
 #ifdef __WXMSW__
     if (!show && m_child && m_child->HasCapture())

-    {       
+    {

         m_child->ReleaseMouse();
     }
 #endif
         m_child->ReleaseMouse();
     }
 #endif

-    
+

     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__
     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__


@@ -380,14 +364,6 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
     return false;
 }
 

-void wxPopupTransientWindow::OnDestroy(wxWindowDestroyEvent& event)
-{
-    if (event.GetEventObject() == m_child)
-        m_child = NULL;
-    if (event.GetEventObject() == m_focus)
-        m_focus = NULL;
-}
-

 #ifdef __WXMSW__
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
 #ifdef __WXMSW__
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {


@@ -411,10 +387,10 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
             {
                 m_child->CaptureMouse();
             }
             {
                 m_child->CaptureMouse();
             }

-        }                
+        }

     }
 }
     }
 }

-#endif
+#endif // __WXMSW__

 
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -474,11 +450,6 @@ void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler
 // ----------------------------------------------------------------------------

-wxPopupWindowHandler::~wxPopupWindowHandler()
-{
-    if (m_popup && (m_popup->m_handlerPopup == this))
-        m_popup->m_handlerPopup = NULL;
-}

 
 void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 {
 
 void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 {


@@ -512,15 +483,15 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
                 // dismissing a tooltip shouldn't waste a click, i.e. you
                 // should be able to dismiss it and press the button with the
                 // same click, so repost this event to the window beneath us
                 // dismissing a tooltip shouldn't waste a click, i.e. you
                 // should be able to dismiss it and press the button with the
                 // same click, so repost this event to the window beneath us

-                wxWindow *win = wxFindWindowAtPoint(event2.GetPosition());
-                if ( win )
+                wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition());
+                if ( winUnder )

                 {
                     // translate the event coords to the ones of the window
                     // which is going to get the event
                 {
                     // translate the event coords to the ones of the window
                     // which is going to get the event

-                    win->ScreenToClient(&event2.m_x, &event2.m_y);
+                    winUnder->ScreenToClient(&event2.m_x, &event2.m_y);

 
 

-                    event2.SetEventObject(win);
-                    wxPostEvent(win, event2);
+                    event2.SetEventObject(winUnder);
+                    wxPostEvent(winUnder, event2);

                 }
             }
             break;
                 }
             }
             break;


@@ -567,11 +538,6 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 // ----------------------------------------------------------------------------
 // wxPopupFocusHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPopupFocusHandler
 // ----------------------------------------------------------------------------

-wxPopupFocusHandler::~wxPopupFocusHandler()
-{
-    if (m_popup && (m_popup->m_handlerFocus == this))
-        m_popup->m_handlerFocus = NULL;
-}

 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {