diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 5c93f19b3d..6e4c3d75b7 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1045,9 +1045,9 @@ objects. If sizer child is used, it sets @row3col{value, integer, Initial value of the control (default: 0).} @row3col{shadow, @ref overview_xrcformat_type_dimension, - Rendered shadow size (default: none; ignored by most platforms).} + Ignored, preserved only for compatibility.} @row3col{bezel, @ref overview_xrcformat_type_dimension, - Rendered bezel size (default: none; ignored by most platforms).} + Ignored, preserved only for compatibility.} @endTable @subsubsection xrc_wxgenericdirctrl wxGenericDirCtrl diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 6bcc940781..2d2bc5a0d9 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -80,16 +80,22 @@ public: // simple accessors bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - // appearance params (not implemented for most ports) - virtual void SetShadowWidth(int w); - virtual int GetShadowWidth() const; - - virtual void SetBezelFace(int w); - virtual int GetBezelFace() const; - // overridden base class virtuals virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + // Deprecated methods not doing anything since a long time. + wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything") + void SetShadowWidth(int WXUNUSED(w)) { } + + wxDEPRECATED_MSG("Remove calls to this method, it always returns 0") + int GetShadowWidth() const { return 0; } + + wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything") + void SetBezelFace(int WXUNUSED(w)) { } + + wxDEPRECATED_MSG("Remove calls to this method, it always returns 0") + int GetBezelFace() const { return 0; } + protected: virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 92827dc73b..98792657b7 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -40,11 +40,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr ); - void SetShadowWidth( int WXUNUSED(w) ) { } - void SetBezelFace( int WXUNUSED(w) ) { } - int GetShadowWidth() const { return 0; } - int GetBezelFace() const { return 0; } - // determinate mode API void SetRange( int r ); void SetValue( int pos ); diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 2d8aa5c8d9..4e7cbb7e6e 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -40,12 +40,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr ); - void SetShadowWidth( int WXUNUSED(w) ) { } - void SetBezelFace( int WXUNUSED(w) ) { } void SetRange( int r ); void SetValue( int pos ); - int GetShadowWidth() const { return 0; } - int GetBezelFace() const { return 0; } int GetRange() const; int GetValue() const; diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h index f839c2cc93..1af241343e 100644 --- a/include/wx/motif/gauge.h +++ b/include/wx/motif/gauge.h @@ -38,11 +38,9 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr); - void SetShadowWidth(int w); void SetRange(int r); void SetValue(int pos); - int GetShadowWidth() const ; int GetRange() const ; int GetValue() const ; diff --git a/interface/wx/gauge.h b/interface/wx/gauge.h index bb51a86773..2636ac225b 100644 --- a/interface/wx/gauge.h +++ b/interface/wx/gauge.h @@ -122,15 +122,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr); - /** - Returns the width of the 3D bezel face. - - @remarks This method is not implemented (returns 0) for most platforms. - - @see SetBezelFace() - */ - int GetBezelFace() const; - /** Returns the maximum position of the gauge. @@ -138,15 +129,6 @@ public: */ int GetRange() const; - /** - Returns the 3D shadow margin width. - - @remarks This method is not implemented (returns 0) for most platforms. - - @see SetShadowWidth() - */ - int GetShadowWidth() const; - /** Returns the current position of the gauge. @@ -170,16 +152,6 @@ public: */ virtual void Pulse(); - /** - Sets the 3D bezel face width. - - @remarks This method is not implemented (doesn't do anything) for most - platforms. - - @see GetBezelFace() - */ - void SetBezelFace(int width); - /** Sets the range (maximum value) of the gauge. This function makes the gauge switch to determinate mode, if it's not already. @@ -192,14 +164,6 @@ public: */ void SetRange(int range); - /** - Sets the 3D shadow width. - - @remarks This method is not implemented (doesn't do anything) for most - platforms. - */ - void SetShadowWidth(int width); - /** Sets the position of the gauge. The @a pos must be between 0 and the gauge range as returned by GetRange(), inclusive. diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp index bac520114d..b26dc1ea68 100644 --- a/src/common/gaugecmn.cpp +++ b/src/common/gaugecmn.cpp @@ -89,10 +89,6 @@ wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \ wxT("Helpstring"), wxT("group")) wxPROPERTY( Range, int, SetRange, GetRange, 0, 0 /*flags*/, \ wxT("Helpstring"), wxT("group")) -wxPROPERTY( ShadowWidth, int, SetShadowWidth, GetShadowWidth, \ - 0, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( BezelFace, int, SetBezelFace, GetBezelFace, \ - 0, 0 /*flags*/, wxT("Helpstring"), wxT("group")) wxPROPERTY_FLAGS( WindowStyle, wxGaugeStyle, long, SetWindowStyleFlag, \ GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ @@ -203,27 +199,4 @@ void wxGaugeBase::Pulse() #endif } -// ---------------------------------------------------------------------------- -// wxGauge appearance params -// ---------------------------------------------------------------------------- - -void wxGaugeBase::SetShadowWidth(int WXUNUSED(w)) -{ -} - -int wxGaugeBase::GetShadowWidth() const -{ - return 0; -} - - -void wxGaugeBase::SetBezelFace(int WXUNUSED(w)) -{ -} - -int wxGaugeBase::GetBezelFace() const -{ - return 0; -} - #endif // wxUSE_GAUGE diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index df237c79fe..5083fbfb85 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -156,13 +156,6 @@ wxSize wxGauge::DoGetBestSize() const return wxSize( 18, 100 ); } -void wxGauge::SetShadowWidth(int w) -{ - if (w == 0) - w = 1; - XtVaSetValues((Widget) m_mainWidget, XmNshadowThickness, w, NULL); -} - void wxGauge::SetRange(int r) { XtVaSetValues((Widget) m_mainWidget, XmNmaximum, r, NULL); @@ -173,13 +166,6 @@ void wxGauge::SetValue(int pos) XtVaSetValues((Widget) m_mainWidget, XmNvalue, pos, NULL); } -int wxGauge::GetShadowWidth() const -{ - Dimension w; - XtVaGetValues((Widget) m_mainWidget, XmNshadowThickness, &w, NULL); - return (int)w; -} - int wxGauge::GetRange() const { int r; diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp index b2a0d12d69..f5008c7089 100644 --- a/src/xrc/xh_gauge.cpp +++ b/src/xrc/xh_gauge.cpp @@ -51,14 +51,6 @@ wxObject *wxGaugeXmlHandler::DoCreateResource() { control->SetValue(GetLong(wxT("value"))); } - if( HasParam(wxT("shadow"))) - { - control->SetShadowWidth(GetDimension(wxT("shadow"))); - } - if( HasParam(wxT("bezel"))) - { - control->SetBezelFace(GetDimension(wxT("bezel"))); - } SetupWindow(control);