Fix for mousewheel events when it is set to page mode instead of lines.

[wxWidgets.git] / src / motif / brush.cpp

diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp
index 1b8069646b40086e797e76d2674872a220d0869a..685b376427d3a7829418348a248b195fc95cab90 100644 (file)
--- a/src/motif/brush.cpp
+++ b/src/motif/brush.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/motif/brush.cpp

 // Purpose:     wxBrush
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxBrush
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,9 +17,7 @@
 #include "wx/utils.h"
 #include "wx/brush.h"
 
 #include "wx/utils.h"
 #include "wx/brush.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)

-#endif

 
 wxBrushRefData::wxBrushRefData()
 {
 
 wxBrushRefData::wxBrushRefData()
 {


@@ -40,40 +38,30 @@ wxBrushRefData::~wxBrushRefData()
 // Brushes
 wxBrush::wxBrush()
 {
 // Brushes
 wxBrush::wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 wxBrush::~wxBrush()
 {
 }
 
 wxBrush::~wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->RemoveBrush(this);

 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)
 {
     m_refData = new wxBrushRefData;
 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)
 {
     m_refData = new wxBrushRefData;

-    
+

     M_BRUSHDATA->m_colour = col;
     M_BRUSHDATA->m_style = Style;
     M_BRUSHDATA->m_colour = col;
     M_BRUSHDATA->m_style = Style;

-    
+

     RealizeResource();
     RealizeResource();

-    
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;

-    
+

     M_BRUSHDATA->m_style = wxSTIPPLE;
     M_BRUSHDATA->m_stipple = stipple;
     M_BRUSHDATA->m_style = wxSTIPPLE;
     M_BRUSHDATA->m_stipple = stipple;

-    
+

     RealizeResource();
     RealizeResource();

-    
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 void wxBrush::Unshare()
 }
 
 void wxBrush::Unshare()


@@ -94,36 +82,36 @@ void wxBrush::Unshare()
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();

-    
+

     M_BRUSHDATA->m_colour = col;
     M_BRUSHDATA->m_colour = col;

-    
+

     RealizeResource();
 }
 
 void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();

-    
+

     M_BRUSHDATA->m_colour.Set(r, g, b);
     M_BRUSHDATA->m_colour.Set(r, g, b);

-    
+

     RealizeResource();
 }
 
 void wxBrush::SetStyle(int Style)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxBrush::SetStyle(int Style)
 {
     Unshare();

-    
+

     M_BRUSHDATA->m_style = Style;
     M_BRUSHDATA->m_style = Style;

-    
+

     RealizeResource();
 }
 
 void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();

-    
+

     M_BRUSHDATA->m_stipple = Stipple;
     M_BRUSHDATA->m_stipple = Stipple;

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }