added new notifications to be added, corrected DoGetBestSize

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 3f257040108f4106bafbab162f3c0aa5f3b44a0f..0a17b278dca4f442f6e42b509a601805f55bfa70 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -108,6 +108,7 @@ static const EventTypeSpec eventList[] =
        { kEventClassControl , kEventControlDraw } ,
 //     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
 //  { kEventClassControl , kEventControlBoundsChanged } ,
        { kEventClassControl , kEventControlDraw } ,
 //     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
 //  { kEventClassControl , kEventControlBoundsChanged } ,

+// kEventControlEnabledStateChanged , kEventControlVisibilityChanged , kEventControlHiliteChanged

 #else
     {}
 #endif
 #else
     {}
 #endif


@@ -1347,6 +1348,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 
 wxSize wxWindowMac::DoGetBestSize() const
 {
 
 wxSize wxWindowMac::DoGetBestSize() const
 {

+    /*

     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;


@@ -1378,6 +1380,8 @@ wxSize wxWindowMac::DoGetBestSize() const
         bestHeight = 13 ;
         
     return wxSize(bestWidth, bestHeight);
         bestHeight = 13 ;
         
     return wxSize(bestWidth, bestHeight);

+    */
+    return wxWindowBase::DoGetBestSize() ;

 }
 
 
 }