openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Remove redundantly duplicated functions in cButton

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-06 00:56:07 -05:00
parent f9f90473f3
commit 9e734d5c47
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osx/dialogxml/button.cpp
View File

@@ -104,14 +104,6 @@ sf::Color cButton::getColour() throw(xUnsupportedProp) {
return sf::Color();
}
void cButton::setBtnType(eBtnType newType) {
type = newType;
}
eBtnType cButton::getBtnType() {
return type;
}
// Indices within the buttons array.
size_t cButton::btnGW[14] = {
0, // BTN_SM
@@ -192,7 +184,7 @@ cLed::cLed(cDialog* parent) :
textFont(FONT_BOLD),
textSize(10),
color(parent->defTextClr) {
setBtnType(BTN_LED);
type = BTN_LED;
}
void cLed::attachClickHandler(click_callback_t f) throw(){
@@ -477,11 +469,11 @@ void cLedGroup::draw(){
}
}
void cButton::setType(eBtnType newType){
if(type == BTN_LED) return; // can't change type
void cButton::setBtnType(eBtnType newType){
if(type == BTN_LED || newType == BTN_LED) return; // can't change type
type = newType;
}
eBtnType cButton::getType(){
eBtnType cButton::getBtnType(){
return type;
}