refactoring SizeEvent sending

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 3cfa8817f21bcf2da4c5856055bef411e93fcd10..57afc42463e7f0e00b259abd557a02205ecd8f56 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -55,6 +55,8 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr );
 
+    virtual void SendSizeEvent(int flags = 0);
+    
     // implement base class pure virtuals
     virtual void SetLabel( const wxString& label );
     virtual wxString GetLabel() const;

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index e1ce896e63642ca7672d59dc4419cebc5f3e9df8..4a137ff4b2f8e53ec8ffb5101db5afd65bab2e39 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1060,11 +1060,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         if ( doResize )
         {
             MacRepositionScrollBars() ;
-            MacOnInternalSize();
-            wxSize size(actualWidth, actualHeight);
-            wxSizeEvent event(size, m_windowId);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
+            SendSizeEvent();
         }
     }
 }
@@ -1118,6 +1114,12 @@ wxSize wxWindowMac::DoGetBestSize() const
     }
 }
 
+void wxWindowMac::SendSizeEvent(int flags)
+{
+    MacOnInternalSize();
+    wxWindowBase::SendSizeEvent(flags);
+}
+
 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
@@ -1144,10 +1146,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
         if (sizeFlags & wxSIZE_FORCE_EVENT)
         {
-            MacOnInternalSize();
-            wxSizeEvent event( wxSize(width,height), GetId() );
-            event.SetEventObject( this );
-            HandleWindowEvent( event );
+            SendSizeEvent();
         }
 
         return;
@@ -1678,10 +1677,7 @@ void wxWindowMac::DoUpdateScrollbarVisibility()
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {
-        MacOnInternalSize();
-        wxSizeEvent event(GetSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        SendSizeEvent();
     }
 #endif
 }