int warning

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 409bdd8d9606104da8f57a9bc5270ee9cd6322e9..7b4445cc308a214b1d2372cdfbc3532a901be7d8 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -26,19 +26,18 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"

+    #include "wx/scrolbar.h"
+    #include "wx/statbox.h"
+    #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
+    #include "wx/layout.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"

 #endif
 
 #endif
 

-#include "wx/layout.h"
-#include "wx/scrolbar.h"
-#include "wx/statbox.h"

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

-#include "wx/statusbr.h"
-#include "wx/menuitem.h"

 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

-#include "wx/textctrl.h"
-
-#include "wx/toolbar.h"

 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"


@@ -68,8 +67,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;
-

 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else


@@ -1764,7 +1761,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 

-    if ( x == -1 && y == -1 )
+    if ( x == wxDefaultCoord && y == wxDefaultCoord )

     {
         wxPoint mouse = wxGetMousePosition();
         x = mouse.x;
     {
         wxPoint mouse = wxGetMousePosition();
         x = mouse.x;


@@ -2548,6 +2545,7 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
     bool showScroller;
     int range, bool refresh)
 {
     bool showScroller;

+    bool triggerSizeEvent = false;

 
     if ( orient == wxHORIZONTAL )
     {
 
     if ( orient == wxHORIZONTAL )
     {


@@ -2555,7 +2553,10 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_hScrollBar->IsShown() != showScroller )
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_hScrollBar->IsShown() != showScroller )

-                m_hScrollBar->Show( showScroller ) ;
+            {
+                m_hScrollBar->Show( showScroller );
+                triggerSizeEvent = true;
+            }

 
             m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }
 
             m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }


@@ -2566,13 +2567,22 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_vScrollBar->IsShown() != showScroller )
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_vScrollBar->IsShown() != showScroller )

+            {

                 m_vScrollBar->Show( showScroller ) ;
                 m_vScrollBar->Show( showScroller ) ;

+                triggerSizeEvent = true;
+            }

 
             m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }
     }
 
     MacRepositionScrollBars() ;
 
             m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }
     }
 
     MacRepositionScrollBars() ;

+    if ( triggerSizeEvent )
+    {
+        wxSizeEvent event(GetSize(), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }

 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll