added debug/release DLL configurations so that VC++ chooses the right one when buildi...

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 79b3bbf23b96aa956a6ff7b48e15dd4342f1676a..e4c673e313951da0b8babf9979947ef7551f89e3 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -282,7 +282,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (!show)
     {
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
     if (!show)
     {
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );

-    
+

         gtk_grab_remove( m_widget );
     }
 #endif
         gtk_grab_remove( m_widget );
     }
 #endif


@@ -295,12 +295,12 @@ bool wxPopupTransientWindow::Show( bool show )
 #endif
 
     bool ret = wxPopupWindow::Show( show );
 #endif
 
     bool ret = wxPopupWindow::Show( show );

-    
+

 #ifdef __WXGTK__
     if (show)
     {
         gtk_grab_add( m_widget );
 #ifdef __WXGTK__
     if (show)
     {
         gtk_grab_add( m_widget );

-        
+

         gdk_pointer_grab( m_widget->window, TRUE,
                           (GdkEventMask)
                             (GDK_BUTTON_PRESS_MASK |
         gdk_pointer_grab( m_widget->window, TRUE,
                           (GdkEventMask)
                             (GDK_BUTTON_PRESS_MASK |


@@ -317,7 +317,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (show)
     {
         Window xwindow = (Window) m_clientWindow;
     if (show)
     {
         Window xwindow = (Window) m_clientWindow;

-        
+

         /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
             True,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
         /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
             True,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,


@@ -382,7 +382,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent)
 void wxPopupComboWindow::PositionNearCombo()
 {
     // the origin point must be in screen coords
 void wxPopupComboWindow::PositionNearCombo()
 {
     // the origin point must be in screen coords

-    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0));
+    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));

 
 #if 0 //def __WXUNIVERSAL__
     // account for the fact that (0, 0) is not the top left corner of the
 
 #if 0 //def __WXUNIVERSAL__
     // account for the fact that (0, 0) is not the top left corner of the