[#1472076] Fixes after stock gdi changes within core library.

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

diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h
index a34c9df3a7d0a4e7c99f475be11003416a0c96bd..534e6a4d154af1c8dcf04e84e72ac7481ea7d740 100644 (file)
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -113,7 +113,7 @@ private:
     int m_maxWeights;
     wxSize m_defaultCellSize;
     wxWindow *m_win; // usually used for debugging
-    wxPen *m_pen;
+    const wxPen *m_pen;
 
     void DrawGridLines(wxDC& dc);
     void Initialize(wxSize size);

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index 0cd1c5fd5005ccfa90d35fe1c1219c6aca560e75..3c3895b61440ef0b997db3d6ec77c16245a9523d 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -301,7 +301,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   inline long GetId() const { return m_id; }
 
   void SetPen(wxPen *pen);
-  void SetBrush(wxBrush *brush);
+  void SetBrush(const wxBrush *brush);
 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }
@@ -330,7 +330,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   void AddText(const wxString& string);
 
   inline wxPen *GetPen() const { return m_pen; }
-  inline wxBrush *GetBrush() const { return m_brush; }
+  inline const wxBrush *GetBrush() const { return m_brush; }
 
   /*
    * Region-specific functions (defaults to the default region
@@ -528,7 +528,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   bool                  m_formatted;
   double                m_xpos, m_ypos;
   wxPen*                m_pen;
-  wxBrush*              m_brush;
+  const wxBrush*        m_brush;
   wxFont*               m_font;
   wxColour              m_textColour;
   wxString              m_textColourName;
@@ -558,7 +558,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   wxShape*              m_parent;      // In case it's a child
   int                   m_formatMode;
   int                   m_shadowMode;
-  wxBrush*              m_shadowBrush;
+  const wxBrush*        m_shadowBrush;
   int                   m_shadowOffsetX;
   int                   m_shadowOffsetY;
   int                   m_textMarginX;    // Gap between text and border

diff --git a/contrib/include/wx/ogl/basicp.h b/contrib/include/wx/ogl/basicp.h
index a0c9b821d7425251708daea5c956b1fafbe79245..43fd2fb825ac5b0d9e045e3faf03a28009d87074 100644 (file)
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -63,12 +63,12 @@ class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape
   inline void SetEraseObject(bool er) { m_eraseObject = er; }
 
 public:
-  int           m_type;
-  double         m_xoffset;
-  double         m_yoffset;
-  wxShape*      m_shape;
-  wxCursor*     m_oldCursor;
-  bool          m_eraseObject; // If true, erases object before dragging handle.
+  int             m_type;
+  double          m_xoffset;
+  double          m_yoffset;
+  wxShape*        m_shape;
+  const wxCursor* m_oldCursor;
+  bool            m_eraseObject; // If true, erases object before dragging handle.
 
 /*
  * Store original top-left, bottom-right coordinates

diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h
index e43bccf08af50bf73890c8cc672d928902883ad8..404763fe54916417583ca6a9ab6557c8256b89be 100644 (file)
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -189,9 +189,9 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
   inline int GetHandleSide() const { return m_handleSide; }
 
   inline void SetLeftSidePen(wxPen *pen) { m_leftSidePen = pen; }
-  inline wxPen *GetLeftSidePen() const { return m_leftSidePen; }
+  inline const wxPen *GetLeftSidePen() const { return m_leftSidePen; }
   inline void SetTopSidePen(wxPen *pen) { m_topSidePen = pen; }
-  inline wxPen *GetTopSidePen() const { return m_topSidePen; }
+  inline const wxPen *GetTopSidePen() const { return m_topSidePen; }
 
   void SetLeftSideColour(const wxString& colour);
   void SetTopSideColour(const wxString& colour);
@@ -214,8 +214,8 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
 
   int                   m_handleSide;       // Side at which handle is legal
 
-  wxPen*                m_leftSidePen;
-  wxPen*                m_topSidePen;
+  const wxPen*          m_leftSidePen;
+  const wxPen*          m_topSidePen;
   wxString              m_leftSideColour;
   wxString              m_topSideColour;
   wxString              m_leftSideStyle;

diff --git a/contrib/include/wx/ogl/drawn.h b/contrib/include/wx/ogl/drawn.h
index d87e4b6f886d43d8659dc50c2d352b30b3e18f69..7b1d0f944993207b29cf4fd8304cfc882279383d 100644 (file)
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -58,7 +58,7 @@ class WXDLLIMPEXP_OGL wxPseudoMetaFile: public wxObject
   inline void SetSize(double w, double h) { m_width = w; m_height = h; }
 
   inline void SetFillBrush(wxBrush* brush) { m_fillBrush = brush; }
-  inline wxBrush* GetFillBrush() const { return m_fillBrush; }
+  inline const wxBrush* GetFillBrush() const { return m_fillBrush; }
 
   inline void SetOutlinePen(wxPen* pen) { m_outlinePen = pen; }
   inline wxPen* GetOutlinePen() const { return m_outlinePen; }
@@ -114,7 +114,7 @@ public:
   // Pen/brush specifying outline/fill colours
   // to override operations.
   wxPen*            m_outlinePen;
-  wxBrush*          m_fillBrush;
+  const wxBrush*    m_fillBrush;
   wxList            m_outlineColours; // List of the GDI operations that comprise the outline
   wxList            m_fillColours; // List of the GDI operations that fill the shape
   double             m_currentRotation;
@@ -219,4 +219,3 @@ private:
 
 #endif
     // _DRAWN_H_
-

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 1e3f4986abc91e86939431a817990a6a08cda90a..6ed61e7e0ee68d3d58f4d952cead1d276029ea32 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -689,7 +689,7 @@ void wxShape::SetPen(wxPen *the_pen)
   m_pen = the_pen;
 }
 
-void wxShape::SetBrush(wxBrush *the_brush)
+void wxShape::SetBrush(const wxBrush *the_brush)
 {
   m_brush = the_brush;
 }
@@ -3284,4 +3284,3 @@ wxBrush wxShape::GetBackgroundBrush()
     }
     return * g_oglWhiteBackgroundBrush;
 }
-

diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index a07ecf35ace698cece9b225e2d73243f6dbb8aa2..f875a404b55b08ab0854b635db4a5317e4e1a70a 100644 (file)
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -837,7 +837,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
 void wxLineShape::OnErase(wxDC& dc)
 {
     wxPen *old_pen = m_pen;
-    wxBrush *old_brush = m_brush;
+    const wxBrush *old_brush = m_brush;
     wxPen bg_pen = GetBackgroundPen();
     wxBrush bg_brush = GetBackgroundBrush();
     SetPen(&bg_pen);
@@ -958,7 +958,7 @@ void wxLineShape::FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming)
 void wxLineShape::OnDrawOutline(wxDC& dc, double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h))
 {
   wxPen *old_pen = m_pen;
-  wxBrush *old_brush = m_brush;
+  const wxBrush *old_brush = m_brush;
 
   wxPen dottedPen(*wxBLACK, 1, wxDOT);
   SetPen(& dottedPen);
@@ -1742,7 +1742,7 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), doub
     wxLineShape *lineShape = (wxLineShape *)this;
 
     wxPen *old_pen = lineShape->GetPen();
-    wxBrush *old_brush = lineShape->GetBrush();
+    const wxBrush *old_brush = lineShape->GetBrush();
 
     wxPen dottedPen(*wxBLACK, 1, wxDOT);
     lineShape->SetPen(& dottedPen);
@@ -1790,7 +1790,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
     lpt->m_point->x = x; lpt->m_point->y = y;
 
     wxPen *old_pen = lineShape->GetPen();
-    wxBrush *old_brush = lineShape->GetBrush();
+    const wxBrush *old_brush = lineShape->GetBrush();
 
     wxPen dottedPen(*wxBLACK, 1, wxDOT);
     lineShape->SetPen(& dottedPen);
@@ -2503,4 +2503,3 @@ void wxLabelShape::OnRightClick(double x, double y, int keys, int attachment)
 {
   m_lineShape->GetEventHandler()->OnRightClick(x, y, keys, attachment);
 }
-