fixing unused param warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -116,12 +116,12 @@ public:
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxBitmap& bitmap,
|
const wxBitmap& bitmap,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
OSStatus err = noErr;
|
OSStatus err = noErr;
|
||||||
ControlButtonContentInfo info;
|
ControlButtonContentInfo info;
|
||||||
|
@@ -116,8 +116,8 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
|
|||||||
const wxString& label,
|
const wxString& label,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
OSStatus err;
|
OSStatus err;
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
@@ -175,12 +175,12 @@ void wxMacControl::SetDefaultButton( bool isDefault )
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& label,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
||||||
|
@@ -18,12 +18,12 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& WXUNUSED(label),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
||||||
|
@@ -44,12 +44,12 @@ public :
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
wxMenu* menu,
|
wxMenu* menu,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStylew)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
|
||||||
|
|
||||||
|
@@ -1030,7 +1030,12 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
|
|||||||
} /* switch */
|
} /* switch */
|
||||||
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
|
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
|
||||||
|
|
||||||
void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice)
|
void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID,
|
||||||
|
DataBrowserPropertyID propertyID,
|
||||||
|
DataBrowserItemState state,
|
||||||
|
Rect const* rectangle,
|
||||||
|
SInt16 WXUNUSED(bitDepth),
|
||||||
|
Boolean WXUNUSED(colorDevice))
|
||||||
{
|
{
|
||||||
DataBrowserTableViewColumnIndex columnIndex;
|
DataBrowserTableViewColumnIndex columnIndex;
|
||||||
|
|
||||||
@@ -1129,7 +1134,11 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowse
|
|||||||
dataViewCustomRendererPtr->SetDC(NULL);
|
dataViewCustomRendererPtr->SetDC(NULL);
|
||||||
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */
|
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */
|
||||||
|
|
||||||
Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit)
|
Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID WXUNUSED(itemID),
|
||||||
|
DataBrowserPropertyID WXUNUSED(propertyID),
|
||||||
|
CFStringRef WXUNUSED(theString),
|
||||||
|
Rect* WXUNUSED(maxEditTextRect),
|
||||||
|
Boolean* WXUNUSED(shrinkToFit))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */
|
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */
|
||||||
|
@@ -621,7 +621,7 @@ IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
|
|||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewIconTextRenderer
|
// wxDataViewIconTextRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
|
wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int WXUNUSED(align))
|
||||||
:wxDataViewRenderer(varianttype,mode)
|
:wxDataViewRenderer(varianttype,mode)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -653,7 +653,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
|
|||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewToggleRenderer
|
// wxDataViewToggleRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
|
wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int WXUNUSED(align))
|
||||||
:wxDataViewRenderer(varianttype,mode)
|
:wxDataViewRenderer(varianttype,mode)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -674,7 +674,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
|
|||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewProgressRenderer
|
// wxDataViewProgressRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align)
|
wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& WXUNUSED(label), wxString const& varianttype, wxDataViewCellMode mode, int align)
|
||||||
:wxDataViewRenderer(varianttype,mode,align)
|
:wxDataViewRenderer(varianttype,mode,align)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -1037,7 +1037,7 @@ wxSize wxDataViewCtrl::DoGetBestSize() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*static*/
|
/*static*/
|
||||||
wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
|
wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
|
||||||
{
|
{
|
||||||
wxVisualAttributes attr;
|
wxVisualAttributes attr;
|
||||||
|
|
||||||
@@ -1305,7 +1305,7 @@ int wxDataViewCtrl::GetSelections(wxDataViewItemArray& sel) const
|
|||||||
return static_cast<int>(NoOfSelectedItems);
|
return static_cast<int>(NoOfSelectedItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxDataViewCtrl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
|
void wxDataViewCtrl::HitTest(wxPoint const& WXUNUSED(point), wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
|
||||||
{
|
{
|
||||||
item = wxDataViewItem();
|
item = wxDataViewItem();
|
||||||
columnPtr = NULL;
|
columnPtr = NULL;
|
||||||
|
@@ -111,9 +111,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
|
|||||||
HIRect rect;
|
HIRect rect;
|
||||||
CGImageRef image;
|
CGImageRef image;
|
||||||
CGContextRef context;
|
CGContextRef context;
|
||||||
void* data;
|
|
||||||
|
|
||||||
size_t bytesPerRow;
|
|
||||||
|
|
||||||
HIViewCreateOffscreenImage( handle, 0, &rect, &image);
|
HIViewCreateOffscreenImage( handle, 0, &rect, &image);
|
||||||
|
|
||||||
|
@@ -46,7 +46,7 @@ wxDrawerWindow::~wxDrawerWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool wxDrawerWindow::Create(wxWindow *parent,
|
bool wxDrawerWindow::Create(wxWindow *parent,
|
||||||
wxWindowID id, const wxString& title,
|
wxWindowID id, const wxString& WXUNUSED(title),
|
||||||
wxSize size, wxDirection edge, const wxString& name)
|
wxSize size, wxDirection edge, const wxString& name)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(NULL != parent, wxT("wxDrawerWindows must be attached to a parent window."));
|
wxASSERT_MSG(NULL != parent, wxT("wxDrawerWindows must be attached to a parent window."));
|
||||||
|
@@ -68,8 +68,8 @@
|
|||||||
wxCFStringRef cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() );
|
wxCFStringRef cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() );
|
||||||
wxCFStringRef cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() );
|
wxCFStringRef cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() );
|
||||||
|
|
||||||
NSRect rectCancel = NSMakeRect( 10.0 , 10.0 , 82 , 24 );
|
NSRect rectCancel = NSMakeRect( (CGFloat) 10.0 , (CGFloat)10.0 , (CGFloat)82 , (CGFloat)24 );
|
||||||
NSRect rectOK = NSMakeRect( 100.0 , 10.0 , 82 , 24 );
|
NSRect rectOK = NSMakeRect( (CGFloat)100.0 , (CGFloat)10.0 , (CGFloat)82 , (CGFloat)24 );
|
||||||
|
|
||||||
NSButton* cancelButton = [[NSButton alloc] initWithFrame:rectCancel];
|
NSButton* cancelButton = [[NSButton alloc] initWithFrame:rectCancel];
|
||||||
[cancelButton setTitle:(NSString*)wxCFRetain((CFStringRef)cfCancelString)];
|
[cancelButton setTitle:(NSString*)wxCFRetain((CFStringRef)cfCancelString)];
|
||||||
|
@@ -72,14 +72,14 @@ public :
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
wxInt32 value,
|
wxInt32 value,
|
||||||
wxInt32 minimum,
|
wxInt32 minimum,
|
||||||
wxInt32 maximum,
|
wxInt32 maximum,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
wxMacGaugeCarbonControl* peer = new wxMacGaugeCarbonControl( wxpeer );
|
wxMacGaugeCarbonControl* peer = new wxMacGaugeCarbonControl( wxpeer );
|
||||||
|
@@ -31,12 +31,12 @@
|
|||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* WXUNUSED(parent),
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );
|
wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );
|
||||||
// TODO CHECK control->SetClientDataType( m_clientDataItemsType );
|
// TODO CHECK control->SetClientDataType( m_clientDataItemsType );
|
||||||
|
@@ -1385,7 +1385,7 @@ wxRect wxListCtrl::GetViewRect() const
|
|||||||
return rect;
|
return rect;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
|
bool wxListCtrl::GetSubItemRect( long item, long WXUNUSED(subItem), wxRect& rect, int code ) const
|
||||||
{
|
{
|
||||||
if (m_genericImpl)
|
if (m_genericImpl)
|
||||||
return m_genericImpl->GetItemRect(item, rect, code);
|
return m_genericImpl->GetItemRect(item, rect, code);
|
||||||
|
@@ -1181,7 +1181,7 @@ void wxNonOwnedWindowCarbonImpl::Create(
|
|||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style, long extraStyle,
|
long style, long extraStyle,
|
||||||
const wxString& name )
|
const wxString& WXUNUSED(name) )
|
||||||
{
|
{
|
||||||
|
|
||||||
OSStatus err = noErr ;
|
OSStatus err = noErr ;
|
||||||
|
@@ -32,11 +32,11 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
|
|
||||||
|
@@ -18,12 +18,12 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& WXUNUSED(label),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
||||||
|
@@ -38,11 +38,11 @@ protected:
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
|
|
||||||
|
@@ -18,14 +18,14 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
wxInt32 value,
|
wxInt32 value,
|
||||||
wxInt32 minimum,
|
wxInt32 minimum,
|
||||||
wxInt32 maximum,
|
wxInt32 maximum,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
int tickMarks = 0;
|
int tickMarks = 0;
|
||||||
|
@@ -19,14 +19,14 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
wxInt32 value,
|
wxInt32 value,
|
||||||
wxInt32 minimum,
|
wxInt32 minimum,
|
||||||
wxInt32 maximum,
|
wxInt32 maximum,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
|
||||||
|
|
||||||
|
@@ -66,7 +66,7 @@ static const EventTypeSpec eventList[] =
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
|
static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef WXUNUSED(handler) , EventRef event , void *data )
|
||||||
{
|
{
|
||||||
OSStatus result = eventNotHandledErr ;
|
OSStatus result = eventNotHandledErr ;
|
||||||
|
|
||||||
@@ -205,13 +205,13 @@ bool wxMacSearchFieldControl::SetFocus()
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* WXUNUSED(parent),
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& str,
|
const wxString& str,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );
|
wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );
|
||||||
|
|
||||||
|
@@ -18,12 +18,12 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& WXUNUSED(label),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
|
|
||||||
|
@@ -39,11 +39,11 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
||||||
|
@@ -103,12 +103,12 @@ wxSize wxStaticText::DoGetBestSize() const
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& WXUNUSED(label),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
|
||||||
|
|
||||||
|
@@ -362,13 +362,13 @@ private :
|
|||||||
};
|
};
|
||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* WXUNUSED(parent),
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& str,
|
const wxString& str,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
bool forceMLTE = false ;
|
bool forceMLTE = false ;
|
||||||
|
|
||||||
|
@@ -28,12 +28,12 @@
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxString& label,
|
const wxString& WXUNUSED(label),
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
|
|
||||||
@@ -45,12 +45,12 @@ wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
|
|||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
|
wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
|
||||||
wxWindowMac* parent,
|
wxWindowMac* parent,
|
||||||
wxWindowID id,
|
wxWindowID WXUNUSED(id),
|
||||||
const wxBitmap& label,
|
const wxBitmap& label,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long WXUNUSED(style),
|
||||||
long extraStyle)
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
wxMacControl* peer = new wxMacControl(wxpeer) ;
|
||||||
|
@@ -1523,7 +1523,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(enabl
|
|||||||
// everything already done in the tool's implementation
|
// everything already done in the tool's implementation
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
|
void wxToolBar::DoToggleTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(toggle))
|
||||||
{
|
{
|
||||||
// everything already done in the tool's implementation
|
// everything already done in the tool's implementation
|
||||||
}
|
}
|
||||||
|
@@ -822,8 +822,13 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
|
|||||||
}
|
}
|
||||||
wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
|
wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
|
||||||
|
|
||||||
wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
|
wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer,
|
||||||
long style, long extraStyle)
|
wxWindowMac* WXUNUSED(parent),
|
||||||
|
wxWindowID WXUNUSED(id),
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
long WXUNUSED(style),
|
||||||
|
long WXUNUSED(extraStyle))
|
||||||
{
|
{
|
||||||
OSStatus err = noErr;
|
OSStatus err = noErr;
|
||||||
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
|
||||||
|
Reference in New Issue
Block a user