changed menu creation for choice and combobox (unique ids), control changed back...

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 30a17488d2f79f62948ac6c3909980dd38e5673c..08f5a8fd7560147eeacd4a812d7c7bd44b0de856 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -23,7 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 

-short nextMenuId = 100 ; // wxMenu takes the lower ids
+extern MenuHandle NewUniqueMenu() ;

 
 wxChoice::~wxChoice()
 {
 
 wxChoice::~wxChoice()
 {


@@ -48,7 +48,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;

                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 36e92ad7a388941ba78371ffb5a93e65252efbd8..a1410b113595afaeccb6dc4ee93aba7f9e69c4bb 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -23,6 +23,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 // right now we don't support editable comboboxes
 
 
 // right now we don't support editable comboboxes
 

+static nextPopUpMenuId = 1000 ;
+MenuHandle NewUniqueMenu() 
+{
+  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+  nextPopUpMenuId++ ;
+  return handle ;
+}

 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,


@@ -43,7 +50,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;

                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                for ( int i = 0 ; i < n ; i++ )
                {
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                for ( int i = 0 ; i < n ; i++ )
                {

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 764da5b8c24b1ce3a74cf32763b5a05fb5047e0d..4d4e3ffc32e630000268d0d5f44eaee12bcd9cce 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -834,9 +834,13 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
        
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;
        
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;

-       
-//             controlpart = FindControl( localwhere , window , &control ) ;
+
+#if TARGET_CARBON

         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;

+#else
+//        control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
+               controlpart = FindControl( localwhere , window , &control ) ;
+#endif

                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )
                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 30a17488d2f79f62948ac6c3909980dd38e5673c..08f5a8fd7560147eeacd4a812d7c7bd44b0de856 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -23,7 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 

-short nextMenuId = 100 ; // wxMenu takes the lower ids
+extern MenuHandle NewUniqueMenu() ;

 
 wxChoice::~wxChoice()
 {
 
 wxChoice::~wxChoice()
 {


@@ -48,7 +48,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;

                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 36e92ad7a388941ba78371ffb5a93e65252efbd8..a1410b113595afaeccb6dc4ee93aba7f9e69c4bb 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -23,6 +23,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 // right now we don't support editable comboboxes
 
 
 // right now we don't support editable comboboxes
 

+static nextPopUpMenuId = 1000 ;
+MenuHandle NewUniqueMenu() 
+{
+  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+  nextPopUpMenuId++ ;
+  return handle ;
+}

 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,


@@ -43,7 +50,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;

                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                for ( int i = 0 ; i < n ; i++ )
                {
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                for ( int i = 0 ; i < n ; i++ )
                {

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 764da5b8c24b1ce3a74cf32763b5a05fb5047e0d..4d4e3ffc32e630000268d0d5f44eaee12bcd9cce 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -834,9 +834,13 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
        
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;
        
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;

-       
-//             controlpart = FindControl( localwhere , window , &control ) ;
+
+#if TARGET_CARBON

         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;

+#else
+//        control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
+               controlpart = FindControl( localwhere , window , &control ) ;
+#endif

                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )
                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )