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

gcc warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-24 07:57:12 +00:00
parent 719ee7c474
commit ebe86b1ea6
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/slider.cpp
View File

@@ -62,8 +62,6 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false; return false;
SInt16 procID;
m_macMinimumStatic = NULL ; m_macMinimumStatic = NULL ;
m_macMaximumStatic = NULL ; m_macMaximumStatic = NULL ;
m_macValueStatic = NULL ; m_macValueStatic = NULL ;

8
src/mac/carbon/textctrl.cpp
View File

@@ -1504,7 +1504,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
int lastHeight = 0 ; int lastHeight = 0 ;
ItemCount n ; ItemCount n ;
for ( n = 0 ; n <= lastpos ; ++n ) for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
{ {
if ( y == ypos && x == xpos ) if ( y == ypos && x == xpos )
return n ; return n ;
@@ -1546,7 +1546,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
int lastHeight = 0 ; int lastHeight = 0 ;
ItemCount n ; ItemCount n ;
for ( n = 0 ; n <= pos ; ++n ) for ( n = 0 ; n <= (ItemCount) pos ; ++n )
{ {
TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt); TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt);
@@ -1612,7 +1612,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
long lastpos = GetLastPosition() ; long lastpos = GetLastPosition() ;
ItemCount n ; ItemCount n ;
for ( n = 0 ; n <= lastpos ; ++n ) for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
{ {
TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt); TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt);
@@ -1653,7 +1653,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
long lastpos = GetLastPosition() ; long lastpos = GetLastPosition() ;
ItemCount n ; ItemCount n ;
for ( n = 0 ; n <= lastpos ; ++n ) for ( n = 0 ; n <= (ItemCount)lastpos ; ++n )
{ {
TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt); TXNOffsetToPoint( (TXNObject) m_macTXN, n , &curpt);

2
src/mac/carbon/toplevel.cpp
View File

@@ -157,8 +157,6 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
{ {
OSStatus result = eventNotHandledErr ; OSStatus result = eventNotHandledErr ;
wxTopLevelWindow* tlw = (wxTopLevelWindow*) data ;
wxWindow* focus = wxWindow::FindFocus() ; wxWindow* focus = wxWindow::FindFocus() ;
if ( focus == NULL ) if ( focus == NULL )
return result ; return result ;

14
src/mac/carbon/window.cpp
View File

@@ -610,10 +610,18 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
{ {
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
UInt32 features = kControlSupportsEmbedding | kControlSupportsLiveFeedback | kControlHasSpecialBackground | UInt32 features = 0
kControlSupportsCalcBestRect | kControlHandlesTracking | kControlSupportsFocus | kControlWantsActivate | kControlWantsIdle; | kControlSupportsEmbedding
// | kControlSupportsLiveFeedback
// | kControlHasSpecialBackground
// | kControlSupportsCalcBestRect
// | kControlHandlesTracking
| kControlSupportsFocus
// | kControlWantsActivate
// | kControlWantsIdle
;
::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, kControlSupportsEmbedding , (ControlRef*) &m_macControl); ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl);
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX