Derive wxWebViewEvent from wxNotifyEvent.

[wxWidgets.git] / src / univ / scrolbar.cpp

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 76a087e935776edd4bf2f45eb4a1840647039ee9..ff451e18fc377f4e91feb80e29bcf01ce91a6e3e 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -74,8 +74,6 @@ private:
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-

 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 


@@ -241,7 +239,7 @@ int wxScrollBar::GetRange() const
 
 void wxScrollBar::SetThumbPosition(int pos)
 {
 
 void wxScrollBar::SetThumbPosition(int pos)
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_range, _T("thumb position out of range") );
+    wxCHECK_RET( pos >= 0 && pos <= m_range, wxT("thumb position out of range") );

 
     DoSetThumb(pos);
 }
 
     DoSetThumb(pos);
 }


@@ -511,7 +509,7 @@ wxRect wxScrollBar::GetScrollbarRect(wxScrollBar::Element elem,
 
         case wxScrollBar::Element_Max:
         default:
 
         case wxScrollBar::Element_Max:
         default:

-            wxFAIL_MSG( _T("unknown scrollbar element") );
+            wxFAIL_MSG( wxT("unknown scrollbar element") );

     }
 
     return rect;
     }
 
     return rect;


@@ -933,11 +931,7 @@ void wxStdScrollBarInputHandler::StopScrolling(wxScrollBar *control)
 
     m_btnCapture = -1;
 
 
     m_btnCapture = -1;
 

-    if ( m_timerScroll )
-    {
-        delete m_timerScroll;
-        m_timerScroll = NULL;
-    }
+    wxDELETE(m_timerScroll);

 
     // unpress the arrow and highlight the current element
     Press(control, false);
 
     // unpress the arrow and highlight the current element
     Press(control, false);


@@ -1088,7 +1082,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,
                 // this is not supposed to happen as the button can't go up
                 // without going down previously and then we'd have
                 // m_winCapture by now
                 // this is not supposed to happen as the button can't go up
                 // without going down previously and then we'd have
                 // m_winCapture by now

-                wxFAIL_MSG( _T("logic error in mouse capturing code") );
+                wxFAIL_MSG( wxT("logic error in mouse capturing code") );

             }
         }
     }
             }
         }
     }