Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed mentions of wxUSE_OWNER_DRAWN: unless I miss something, this doesn't make any sense for Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-08 21:49:22 +00:00
parent 2f31c6ec81
commit de1b0aeb6c
2 changed files with 72 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/wx/mac/carbon/listbox.h
View File

@@ -23,15 +23,6 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
#if wxUSE_OWNER_DRAWN
class WXDLLEXPORT wxOwnerDrawn;
// define the array of list box items
#include "wx/dynarray.h"
WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
#endif // wxUSE_OWNER_DRAWN
// forward decl for GetSelections() // forward decl for GetSelections()
class wxArrayInt; class wxArrayInt;
@@ -86,7 +77,7 @@ public:
virtual ~wxListBox(); virtual ~wxListBox();
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL); virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
// implement base class pure virtuals // implement base class pure virtuals
virtual void Clear(); virtual void Clear();
virtual void Delete(int n); virtual void Delete(int n);
@@ -114,21 +105,9 @@ public:
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
// wxCheckListBox support // wxCheckListBox support
#if wxUSE_OWNER_DRAWN
// plug-in for derived classes
virtual wxOwnerDrawn *CreateItem(size_t n);
// allows to get the item and use SetXXX functions to set it's appearance
wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
// get the index of the given item
int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
#endif // wxUSE_OWNER_DRAWN
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// Windows callbacks // Windows callbacks
#ifndef __WXMAC_OSX__ #ifndef __WXMAC_OSX__
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
@@ -137,10 +116,10 @@ public:
void* m_macList ; void* m_macList ;
wxArrayString m_stringArray ; wxArrayString m_stringArray ;
wxListDataArray m_dataArray ; wxListDataArray m_dataArray ;
// as we are getting the same events for human and API selection we have to suppress // as we are getting the same events for human and API selection we have to suppress
// events in the latter case // events in the latter case
bool MacIsSelectionSuppressed() const { return m_suppressSelection ; } bool MacIsSelectionSuppressed() const { return m_suppressSelection ; }
protected: protected:
void MacDelete( int n ) ; void MacDelete( int n ) ;
void MacInsert( int n , const wxString& item) ; void MacInsert( int n , const wxString& item) ;
@@ -153,10 +132,10 @@ protected:
int MacGetSelections(wxArrayInt& aSelections) const ; int MacGetSelections(wxArrayInt& aSelections) const ;
bool MacIsSelected( int n ) const ; bool MacIsSelected( int n ) const ;
void MacScrollTo( int n ) ; void MacScrollTo( int n ) ;
bool MacSuppressSelection( bool suppress ) ; bool MacSuppressSelection( bool suppress ) ;
// free memory (common part of Clear() and dtor) // free memory (common part of Clear() and dtor)
// prevent collision with some BSD definitions of macro Free() // prevent collision with some BSD definitions of macro Free()
void FreeData(); void FreeData();
int m_noItems; int m_noItems;
@@ -167,15 +146,9 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
#if wxUSE_OWNER_DRAWN
// control items
wxListBoxItemsArray m_aItems;
#endif
private: private:
DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_DYNAMIC_CLASS(wxListBox)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif #endif // _WX_LISTBOX_H_
// _WX_LISTBOX_H_

201
src/mac/carbon/listbox.cpp
View File

@@ -106,37 +106,37 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemID itemID, DataBrowserPropertyID property,
DataBrowserItemDataRef itemData, Boolean changeValue) DataBrowserItemDataRef itemData, Boolean changeValue)
{ {
OSStatus err = errDataBrowserPropertyNotSupported; OSStatus err = errDataBrowserPropertyNotSupported;
if ( ! changeValue ) if ( ! changeValue )
{ {
switch (property) switch (property)
{ {
case kTextColumnId: case kTextColumnId:
{ {
long ref = GetControlReference( browser ) ; long ref = GetControlReference( browser ) ;
if ( ref ) if ( ref )
{ {
wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ; wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
int i = itemID - 1 ; int i = itemID - 1 ;
if (i >= 0 && i < list->GetCount() ) if (i >= 0 && i < list->GetCount() )
{ {
wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ; wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ; verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
err = noErr ; err = noErr ;
} }
} }
} }
break; break;
default: default:
break; break;
} }
} }
return err; return err;
} }
static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item , DataBrowserPropertyID property , static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item , DataBrowserPropertyID property ,
@@ -147,10 +147,10 @@ static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item
long systemVersion; long systemVersion;
cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item ); cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
ThemeDrawingState themeState ; ThemeDrawingState themeState ;
GetThemeDrawingState( &themeState ) ; GetThemeDrawingState( &themeState ) ;
if ( itemState == kDataBrowserItemIsSelected ) // In this sample we handle the "selected" state, all others fall through to our "active" state if ( itemState == kDataBrowserItemIsSelected ) // In this sample we handle the "selected" state, all others fall through to our "active" state
{ {
Gestalt( gestaltSystemVersion, &systemVersion ); Gestalt( gestaltSystemVersion, &systemVersion );
@@ -163,7 +163,7 @@ static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item
SetThemeDrawingState( themeState , false ) ; SetThemeDrawingState( themeState , false ) ;
} }
DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL ); DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
if ( cfString != NULL ) if ( cfString != NULL )
CFRelease( cfString ); CFRelease( cfString );
SetThemeDrawingState( themeState , true ) ; SetThemeDrawingState( themeState , true ) ;
} }
@@ -229,58 +229,58 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
options += kDataBrowserSelectOnlyOne ; options += kDataBrowserSelectOnlyOne ;
} }
verify_noerr(m_peer->SetSelectionFlags( options ) ); verify_noerr(m_peer->SetSelectionFlags( options ) );
if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ; if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
if ( gDataBrowserItemNotificationUPP == NULL ) if ( gDataBrowserItemNotificationUPP == NULL )
{ {
gDataBrowserItemNotificationUPP = gDataBrowserItemNotificationUPP =
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
(DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ; (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
#else #else
NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ; NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
#endif #endif
} }
if ( gDataBrowserDrawItemUPP == NULL ) gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ; if ( gDataBrowserDrawItemUPP == NULL ) gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
DataBrowserCallbacks callbacks ; DataBrowserCallbacks callbacks ;
InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ; InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;
callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP; callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP; callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
m_peer->SetCallbacks( &callbacks); m_peer->SetCallbacks( &callbacks);
DataBrowserCustomCallbacks customCallbacks ; DataBrowserCustomCallbacks customCallbacks ;
InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ; InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;
customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ; customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ; SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
DataBrowserListViewColumnDesc columnDesc ; DataBrowserListViewColumnDesc columnDesc ;
columnDesc.headerBtnDesc.titleOffset = 0; columnDesc.headerBtnDesc.titleOffset = 0;
columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
columnDesc.headerBtnDesc.btnFontStyle.flags = columnDesc.headerBtnDesc.btnFontStyle.flags =
kControlUseFontMask | kControlUseJustMask; kControlUseFontMask | kControlUseJustMask;
columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
columnDesc.headerBtnDesc.minimumWidth = 0; columnDesc.headerBtnDesc.minimumWidth = 0;
columnDesc.headerBtnDesc.maximumWidth = 10000; columnDesc.headerBtnDesc.maximumWidth = 10000;
columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
columnDesc.headerBtnDesc.btnFontStyle.style = normal; columnDesc.headerBtnDesc.btnFontStyle.style = normal;
columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" ); columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
columnDesc.propertyDesc.propertyID = kTextColumnId; columnDesc.propertyDesc.propertyID = kTextColumnId;
columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType; columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
columnDesc.propertyDesc.propertyFlags = columnDesc.propertyDesc.propertyFlags =
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
kDataBrowserListViewTypeSelectColumn | kDataBrowserListViewTypeSelectColumn |
#endif #endif
kDataBrowserTableViewSelectionColumn ; kDataBrowserTableViewSelectionColumn ;
verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ; verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
verify_noerr(m_peer->AutoSizeListViewColumns() ) ; verify_noerr(m_peer->AutoSizeListViewColumns() ) ;
verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ; verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ;
verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) ) ; verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) ) ;
@@ -317,19 +317,6 @@ wxListBox::~wxListBox()
void wxListBox::FreeData() void wxListBox::FreeData()
{ {
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
{
size_t uiCount = m_aItems.Count();
while ( uiCount-- != 0 ) {
delete m_aItems[uiCount];
m_aItems[uiCount] = NULL;
}
m_aItems.Clear();
}
else
#endif // wxUSE_OWNER_DRAWN
if ( HasClientObjectData() ) if ( HasClientObjectData() )
{ {
for ( size_t n = 0; n < (size_t)m_noItems; n++ ) for ( size_t n = 0; n < (size_t)m_noItems; n++ )
@@ -356,15 +343,10 @@ void wxListBox::Delete(int N)
wxCHECK_RET( N >= 0 && N < m_noItems, wxCHECK_RET( N >= 0 && N < m_noItems,
wxT("invalid index in wxListBox::Delete") ); wxT("invalid index in wxListBox::Delete") );
#if wxUSE_OWNER_DRAWN
delete m_aItems[N];
m_aItems.RemoveAt(N);
#else // !wxUSE_OWNER_DRAWN
if ( HasClientObjectData() ) if ( HasClientObjectData() )
{ {
delete GetClientObject(N); delete GetClientObject(N);
} }
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
m_stringArray.RemoveAt( N ) ; m_stringArray.RemoveAt( N ) ;
m_dataArray.RemoveAt( N ) ; m_dataArray.RemoveAt( N ) ;
m_noItems --; m_noItems --;
@@ -395,35 +377,11 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{ {
if ( clientData ) if ( clientData )
{ {
#if wxUSE_OWNER_DRAWN
wxASSERT_MSG(clientData[i] == NULL,
wxT("Can't use client data with owner-drawn listboxes"));
#else // !wxUSE_OWNER_DRAWN
Append( choices[i] , clientData[i] ) ; Append( choices[i] , clientData[i] ) ;
#endif
} }
else else
Append( choices[i] ) ; Append( choices[i] ) ;
} }
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
// first delete old items
size_t ui = m_aItems.Count();
while ( ui-- != 0 ) {
delete m_aItems[ui];
m_aItems[ui] = NULL;
}
m_aItems.Empty();
// then create new ones
for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
wxOwnerDrawn *pNewItem = CreateItem(ui);
pNewItem->SetName(choices[ui]);
m_aItems.Add(pNewItem);
}
}
#endif // wxUSE_OWNER_DRAWN
} }
int wxListBox::FindString(const wxString& s) const int wxListBox::FindString(const wxString& s) const
@@ -438,7 +396,7 @@ int wxListBox::FindString(const wxString& s) const
for ( int i = 0 ; i < m_noItems ; ++ i ) for ( int i = 0 ; i < m_noItems ; ++ i )
{ {
wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ; wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
if ( EqualString( s1 , s2 , false , false ) ) if ( EqualString( s1 , s2 , false , false ) )
return i ; return i ;
@@ -463,7 +421,7 @@ int wxListBox::FindString(const wxString& s) const
for ( int i = 0 ; i < m_noItems ; ++ i ) for ( int i = 0 ; i < m_noItems ; ++ i )
{ {
wxMacStringToPascal( m_stringArray[i] , s1 ) ; wxMacStringToPascal( m_stringArray[i] , s1 ) ;
if ( EqualString( s1 , s2 , false , false ) ) if ( EqualString( s1 , s2 , false , false ) )
return i ; return i ;
@@ -518,14 +476,6 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
wxCHECK_RET( N >= 0 && N < m_noItems, wxCHECK_RET( N >= 0 && N < m_noItems,
wxT("invalid index in wxListBox::SetClientData") ); wxT("invalid index in wxListBox::SetClientData") );
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
{
// client data must be pointer to wxOwnerDrawn, otherwise we would crash
// in OnMeasure/OnDraw.
wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
}
#endif // wxUSE_OWNER_DRAWN
wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ; wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
if ( m_dataArray.GetCount() > (size_t) N ) if ( m_dataArray.GetCount() > (size_t) N )
@@ -655,27 +605,6 @@ void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
wxControl::Refresh( eraseBack , rect ) ; wxControl::Refresh( eraseBack , rect ) ;
} }
#if wxUSE_OWNER_DRAWN
class wxListBoxItem : public wxOwnerDrawn
{
public:
wxListBoxItem(const wxString& str = "");
};
wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
{
// no bitmaps/checkmarks
SetMarginWidth(0);
}
wxOwnerDrawn *wxListBox::CreateItem(size_t n)
{
return new wxListBoxItem();
}
#endif //USE_OWNER_DRAWN
// Some custom controls depend on this // Some custom controls depend on this
/* static */ wxVisualAttributes /* static */ wxVisualAttributes
@@ -777,9 +706,9 @@ void wxListBox::MacSetSelection( int n , bool select )
bool wxListBox::MacSuppressSelection( bool suppress ) bool wxListBox::MacSuppressSelection( bool suppress )
{ {
bool former = m_suppressSelection ; bool former = m_suppressSelection ;
m_suppressSelection = suppress ; m_suppressSelection = suppress ;
return former ; return former ;
} }
bool wxListBox::MacIsSelected( int n ) const bool wxListBox::MacIsSelected( int n ) const
@@ -865,14 +794,14 @@ void wxListBox::OnChar(wxKeyEvent& event)
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */ /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) ) else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
{ {
// FIXME: look in ancestors, not just parent. // FIXME: look in ancestors, not just parent.
wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ; wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
if (win) if (win)
{ {
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( win ); new_event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( new_event ); win->GetEventHandler()->ProcessEvent( new_event );
} }
} }
else if ( event.GetKeyCode() == WXK_TAB ) else if ( event.GetKeyCode() == WXK_TAB )
{ {