suppress gcc printf format warning

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-18 00:42:17 +00:00
parent 54933611e8
commit 725566cab4

View File

@@ -564,9 +564,10 @@ public :
{ {
T value; T value;
OSStatus err = GetData<T>( inPartCode , inTag , &value ); OSStatus err = GetData<T>( inPartCode , inTag , &value );
wxASSERT_MSG(err == noErr, wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"), wxASSERT_MSG( err == noErr,
inPartCode, inTag)); wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
inPartCode, (int)inTag) );
return value; return value;
} }
template <typename T> OSStatus GetData( ResType inTag , T *data ) const template <typename T> OSStatus GetData( ResType inTag , T *data ) const
@@ -578,7 +579,7 @@ public :
{ {
return GetData<T>( kControlEntireControl , inTag ); return GetData<T>( kControlEntireControl , inTag );
} }
// Flash the control for the specified amount of time // Flash the control for the specified amount of time
virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ); virtual void Flash( ControlPartCode part , UInt32 ticks = 8 );
@@ -628,10 +629,10 @@ public :
virtual void GetFeatures( UInt32 *features ); virtual void GetFeatures( UInt32 *features );
virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ); virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region );
virtual OSStatus SetZOrder( bool above , wxMacControl* other ); virtual OSStatus SetZOrder( bool above , wxMacControl* other );
bool IsCompositing() { return m_isCompositing; } bool IsCompositing() { return m_isCompositing; }
bool IsRootControl() { return m_isRootControl; } bool IsRootControl() { return m_isRootControl; }
wxWindow* GetPeer() const wxWindow* GetPeer() const
{ {
return m_peer; return m_peer;
@@ -663,26 +664,26 @@ public :
wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style); wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks ); OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
OSStatus GetItemCount( DataBrowserItemID container, OSStatus GetItemCount( DataBrowserItemID container,
Boolean recurse, Boolean recurse,
DataBrowserItemState state, DataBrowserItemState state,
UInt32 *numItems) const; UInt32 *numItems) const;
OSStatus GetItems( DataBrowserItemID container, OSStatus GetItems( DataBrowserItemID container,
Boolean recurse, Boolean recurse,
DataBrowserItemState state, DataBrowserItemState state,
Handle items) const; Handle items) const;
OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc, OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc,
DataBrowserTableViewColumnIndex position ); DataBrowserTableViewColumnIndex position );
OSStatus AutoSizeColumns(); OSStatus AutoSizeColumns();
OSStatus SetHasScrollBars( bool horiz, bool vert ); OSStatus SetHasScrollBars( bool horiz, bool vert );
OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle ); OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
OSStatus SetHeaderButtonHeight( UInt16 height ); OSStatus SetHeaderButtonHeight( UInt16 height );
OSStatus GetHeaderButtonHeight( UInt16 *height ); OSStatus GetHeaderButtonHeight( UInt16 *height );
@@ -690,7 +691,7 @@ public :
const DataBrowserItemID *items, const DataBrowserItemID *items,
DataBrowserPropertyID preSortProperty, DataBrowserPropertyID preSortProperty,
DataBrowserPropertyID propertyID ) const; DataBrowserPropertyID propertyID ) const;
OSStatus AddItems( DataBrowserItemID container, UInt32 numItems, OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID *items, const DataBrowserItemID *items,
DataBrowserPropertyID preSortProperty ); DataBrowserPropertyID preSortProperty );
@@ -708,46 +709,46 @@ public :
const DataBrowserItemID *items, const DataBrowserItemID *items,
DataBrowserSetOption operation ); DataBrowserSetOption operation );
OSStatus GetItemID( DataBrowserTableViewRowIndex row, OSStatus GetItemID( DataBrowserTableViewRowIndex row,
DataBrowserItemID * item ) const; DataBrowserItemID * item ) const;
OSStatus GetItemRow( DataBrowserItemID item, OSStatus GetItemRow( DataBrowserItemID item,
DataBrowserTableViewRowIndex * row ) const; DataBrowserTableViewRowIndex * row ) const;
OSStatus SetDefaultRowHeight( UInt16 height ); OSStatus SetDefaultRowHeight( UInt16 height );
OSStatus GetDefaultRowHeight( UInt16 * height ) const; OSStatus GetDefaultRowHeight( UInt16 * height ) const;
OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height); OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height);
OSStatus GetRowHeight( DataBrowserItemID item , UInt16 *height) const; OSStatus GetRowHeight( DataBrowserItemID item , UInt16 *height) const;
OSStatus GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const; OSStatus GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const;
OSStatus SetColumnWidth( DataBrowserPropertyID column , UInt16 width ); OSStatus SetColumnWidth( DataBrowserPropertyID column , UInt16 width );
OSStatus GetDefaultColumnWidth( UInt16 *width ) const; OSStatus GetDefaultColumnWidth( UInt16 *width ) const;
OSStatus SetDefaultColumnWidth( UInt16 width ); OSStatus SetDefaultColumnWidth( UInt16 width );
OSStatus GetColumnCount( UInt32* numColumns) const; OSStatus GetColumnCount( UInt32* numColumns) const;
OSStatus GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const; OSStatus GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const;
OSStatus SetColumnPosition( DataBrowserPropertyID column, UInt32 position); OSStatus SetColumnPosition( DataBrowserPropertyID column, UInt32 position);
OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const; OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
OSStatus SetScrollPosition( UInt32 top , UInt32 left ); OSStatus SetScrollPosition( UInt32 top , UInt32 left );
OSStatus GetSortProperty( DataBrowserPropertyID *column ) const; OSStatus GetSortProperty( DataBrowserPropertyID *column ) const;
OSStatus SetSortProperty( DataBrowserPropertyID column ); OSStatus SetSortProperty( DataBrowserPropertyID column );
OSStatus GetSortOrder( DataBrowserSortOrder *order ) const; OSStatus GetSortOrder( DataBrowserSortOrder *order ) const;
OSStatus SetSortOrder( DataBrowserSortOrder order ); OSStatus SetSortOrder( DataBrowserSortOrder order );
OSStatus GetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags *flags ) const; OSStatus GetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags *flags ) const;
OSStatus SetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags flags ); OSStatus SetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags flags );
OSStatus GetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ) const; OSStatus GetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ) const;
OSStatus SetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ); OSStatus SetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc );
OSStatus SetDisclosureColumn( DataBrowserPropertyID property , Boolean expandableRows ); OSStatus SetDisclosureColumn( DataBrowserPropertyID property , Boolean expandableRows );
protected : protected :
static pascal void DataBrowserItemNotificationProc( static pascal void DataBrowserItemNotificationProc(
ControlRef browser, ControlRef browser,
DataBrowserItemID itemID, DataBrowserItemID itemID,
@@ -773,18 +774,18 @@ protected :
Boolean changeValue ) = 0; Boolean changeValue ) = 0;
static pascal Boolean DataBrowserCompareProc( static pascal Boolean DataBrowserCompareProc(
ControlRef browser, ControlRef browser,
DataBrowserItemID itemOneID, DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID, DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty); DataBrowserPropertyID sortProperty);
virtual Boolean CompareItems(DataBrowserItemID itemOneID, virtual Boolean CompareItems(DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID, DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty) = 0; DataBrowserPropertyID sortProperty) = 0;
}; };
// ============================================================================ // ============================================================================
// Higher-level Databrowser // Higher-level Databrowser
// ============================================================================ // ============================================================================
// //
// basing on data item objects // basing on data item objects
@@ -801,18 +802,18 @@ class wxMacDataItem
public : public :
wxMacDataItem(); wxMacDataItem();
virtual ~wxMacDataItem(); virtual ~wxMacDataItem();
virtual bool IsLessThan(wxMacDataItemBrowserControl *owner , virtual bool IsLessThan(wxMacDataItemBrowserControl *owner ,
const wxMacDataItem*, const wxMacDataItem*,
DataBrowserPropertyID property) const; DataBrowserPropertyID property) const;
// returns true if access was successful, otherwise false // returns true if access was successful, otherwise false
virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner , virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner ,
DataBrowserPropertyID property, DataBrowserPropertyID property,
DataBrowserItemDataRef itemData, DataBrowserItemDataRef itemData,
bool changeValue ); bool changeValue );
virtual void Notification(wxMacDataItemBrowserControl *owner , virtual void Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData ) const; DataBrowserItemDataRef itemData ) const;
}; };
@@ -826,39 +827,39 @@ class wxMacDataItemBrowserControl : public wxMacDataBrowserControl
{ {
public : public :
wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style); wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
unsigned int GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const; unsigned int GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const;
void GetItems(const wxMacDataItem* container, bool recurse , void GetItems(const wxMacDataItem* container, bool recurse ,
DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const; DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const;
unsigned int GetLineFromItem(const wxMacDataItem *item) const; unsigned int GetLineFromItem(const wxMacDataItem *item) const;
wxMacDataItem * GetItemFromLine(unsigned int n) const; wxMacDataItem * GetItemFromLine(unsigned int n) const;
void UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item, void UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item,
DataBrowserPropertyID property) const; DataBrowserPropertyID property) const;
void UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items, void UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items,
DataBrowserPropertyID property) const; DataBrowserPropertyID property) const;
void AddItem(wxMacDataItem *container, wxMacDataItem *item); void AddItem(wxMacDataItem *container, wxMacDataItem *item);
void AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items ); void AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items );
void RemoveAllItems(wxMacDataItem *container); void RemoveAllItems(wxMacDataItem *container);
void RemoveItem(wxMacDataItem *container, wxMacDataItem* item); void RemoveItem(wxMacDataItem *container, wxMacDataItem* item);
void RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items); void RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items);
void SetSelectedItem( wxMacDataItem* item , DataBrowserSetOption option); void SetSelectedItem( wxMacDataItem* item , DataBrowserSetOption option);
void SetSelectedItems( wxArrayMacDataItemPtr &items , DataBrowserSetOption option); void SetSelectedItems( wxArrayMacDataItemPtr &items , DataBrowserSetOption option);
void SetSelectedAllItems( DataBrowserSetOption option); void SetSelectedAllItems( DataBrowserSetOption option);
Boolean IsItemSelected( const wxMacDataItem* item) const; Boolean IsItemSelected( const wxMacDataItem* item) const;
void RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options); void RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options);
void GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const; void GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const;
// item aware methods, to be used in subclasses // item aware methods, to be used in subclasses
virtual Boolean CompareItems(const wxMacDataItem* itemOneID, virtual Boolean CompareItems(const wxMacDataItem* itemOneID,
const wxMacDataItem* itemTwoID, const wxMacDataItem* itemTwoID,
DataBrowserPropertyID sortProperty); DataBrowserPropertyID sortProperty);
virtual OSStatus GetSetItemData(wxMacDataItem* itemID, virtual OSStatus GetSetItemData(wxMacDataItem* itemID,
@@ -879,9 +880,9 @@ public :
protected: protected:
// ID aware base methods, should be 'final' ie not changed in subclasses // ID aware base methods, should be 'final' ie not changed in subclasses
virtual Boolean CompareItems(DataBrowserItemID itemOneID, virtual Boolean CompareItems(DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID, DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty); DataBrowserPropertyID sortProperty);
virtual OSStatus GetSetItemData(DataBrowserItemID itemID, virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
@@ -904,7 +905,7 @@ class wxMacDataItemBrowserSelectionSuppressor
public : public :
wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser); wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
~wxMacDataItemBrowserSelectionSuppressor(); ~wxMacDataItemBrowserSelectionSuppressor();
private : private :
bool m_former; bool m_former;
@@ -921,14 +922,14 @@ class wxMacListBoxItem : public wxMacDataItem
{ {
public : public :
wxMacListBoxItem(); wxMacListBoxItem();
virtual ~wxMacListBoxItem(); virtual ~wxMacListBoxItem();
void SetLabel( const wxString& str); void SetLabel( const wxString& str);
const wxString& GetLabel() const; const wxString& GetLabel() const;
virtual bool IsLessThan(wxMacDataItemBrowserControl *owner , virtual bool IsLessThan(wxMacDataItemBrowserControl *owner ,
const wxMacDataItem* rhs, const wxMacDataItem* rhs,
DataBrowserPropertyID sortProperty) const; DataBrowserPropertyID sortProperty) const;
virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner , virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
@@ -936,13 +937,13 @@ public :
DataBrowserItemDataRef itemData, DataBrowserItemDataRef itemData,
bool changeValue ); bool changeValue );
virtual void Notification(wxMacDataItemBrowserControl *owner , virtual void Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData ) const; DataBrowserItemDataRef itemData ) const;
void SetOrder( SInt32 order ); void SetOrder( SInt32 order );
SInt32 GetOrder() const; SInt32 GetOrder() const;
void SetData( void* data); void SetData( void* data);
void* GetData() const; void* GetData() const;
@@ -964,7 +965,7 @@ public:
virtual wxMacListBoxItem* CreateItem(); virtual wxMacListBoxItem* CreateItem();
// add and remove // add and remove
void MacDelete( unsigned int n ); void MacDelete( unsigned int n );
void MacInsert( unsigned int n, const wxString& item ); void MacInsert( unsigned int n, const wxString& item );
void MacInsert( unsigned int n, const wxArrayString& items ); void MacInsert( unsigned int n, const wxArrayString& items );
@@ -972,7 +973,7 @@ public:
void MacClear(); void MacClear();
// selecting // selecting
void MacDeselectAll(); void MacDeselectAll();
void MacSetSelection( unsigned int n, bool select ); void MacSetSelection( unsigned int n, bool select );
int MacGetSelection() const; int MacGetSelection() const;
@@ -984,7 +985,7 @@ public:
void MacScrollTo( unsigned int n ); void MacScrollTo( unsigned int n );
// accessing content // accessing content
void MacSetString( unsigned int n, const wxString& item ); void MacSetString( unsigned int n, const wxString& item );
void MacSetClientData( unsigned int n, void * data); void MacSetClientData( unsigned int n, void * data);
wxString MacGetString( unsigned int n) const; wxString MacGetString( unsigned int n) const;
@@ -1177,14 +1178,14 @@ private :
ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart ); ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
{ {
*rect = (**pict).picFrame; *rect = (**pict).picFrame;
return rect; return rect;
} }
#else #else
inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
{ {
return QDGetPictureBounds( pict , rect ); return QDGetPictureBounds( pict , rect );
} }
#endif #endif