gcc warnings

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index b84db95870619a278c7c39347312921043c609b4..d1dd3ee950fd570c6a5f04c7ee7677f84cec35bb 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -62,8 +62,6 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
-    SInt16 procID;
-    
     m_macMinimumStatic = NULL ;
     m_macMaximumStatic = NULL ;
     m_macValueStatic = NULL ;

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f0893d9cb5b50619c0053de3c0aa49207b866228..ed7226ccf8c13e6bb3a4e71e233ae1fa580d0591 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1504,7 +1504,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
     int lastHeight = 0 ;
 
     ItemCount n ;
-    for ( n = 0 ; n <= lastpos ; ++n )
+    for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
     {
         if ( y == ypos && x == xpos )
             return n ;
@@ -1546,7 +1546,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
         int lastHeight = 0 ;
 
         ItemCount n ;
-        for ( n = 0 ; n <= pos ; ++n )
+        for ( n = 0 ; n <= (ItemCount) pos ; ++n )
         {
             TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
 
@@ -1612,7 +1612,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
         long lastpos = GetLastPosition() ;
 
         ItemCount n ;
-        for ( n = 0 ; n <= lastpos ; ++n )
+        for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
         {
             TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
 
@@ -1653,7 +1653,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
         long lastpos = GetLastPosition() ;
 
         ItemCount n ;
-        for ( n = 0 ; n <= lastpos ; ++n )
+        for ( n = 0 ; n <= (ItemCount)lastpos ; ++n )
         {
             TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
 

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 114194804f80241edefd411548de5ea48d31b300..c7f7fd7c0fa304a1ee6514cf61c88b5bc39ef21a 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -157,8 +157,6 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 {
     OSStatus result = eventNotHandledErr ;
 
-    wxTopLevelWindow* tlw = (wxTopLevelWindow*) data ;
-
     wxWindow* focus = wxWindow::FindFocus() ;
     if ( focus == NULL )
         return result ;

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 0d5bf2fab7f4d0f15864780d3f4441ec904a5576..37293231dbd56cd342d9feb5b3731fb2fdc61386 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -610,10 +610,18 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     {
         Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
         
-        UInt32 features = kControlSupportsEmbedding | kControlSupportsLiveFeedback | kControlHasSpecialBackground  | 
-        kControlSupportsCalcBestRect | kControlHandlesTracking | kControlSupportsFocus | kControlWantsActivate | kControlWantsIdle; 
-
-        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, kControlSupportsEmbedding , (ControlRef*) &m_macControl); 
+        UInt32 features = 0
+                       | kControlSupportsEmbedding 
+//                     | kControlSupportsLiveFeedback 
+//                     | kControlHasSpecialBackground  
+//                     | kControlSupportsCalcBestRect 
+//                     | kControlHandlesTracking 
+                       | kControlSupportsFocus 
+//                     | kControlWantsActivate 
+//                     | kControlWantsIdle
+                       ; 
+
+        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl); 
 
         MacPostControlCreate(pos,size) ;
 #if !TARGET_API_MAC_OSX