https://github.com/libsdl-org/Maelstrom/commit/81e8f4ff8122aa881dfbc45fcf0e40609aa6df2f
From 81e8f4ff8122aa881dfbc45fcf0e40609aa6df2f Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 29 Oct 2011 10:53:33 -0400
Subject: [PATCH] Organized the function order a little bit.
---
screenlib/UIElementButton.h | 4 ++--
screenlib/UIElementCheckbox.h | 4 ++--
screenlib/UIElementLine.h | 4 ++--
screenlib/UIElementRect.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/screenlib/UIElementButton.h b/screenlib/UIElementButton.h
index 0a199f75..f0c9db48 100644
--- a/screenlib/UIElementButton.h
+++ b/screenlib/UIElementButton.h
@@ -45,14 +45,14 @@ class UIElementButton : public UIElement
virtual bool HandleEvent(const SDL_Event &event);
- /* These should be overridden by inherited classes */
+ // These can be overridden by inherited classes
virtual void OnMouseEnter() { }
virtual void OnMouseLeave() { }
virtual void OnMouseDown() { }
virtual void OnMouseUp() { }
virtual void OnClick();
- /* Setting a click callback sets a simplified delegate */
+ // Setting a click callback sets a simplified delegate
void SetClickCallback(void (*callback)(void));
void SetButtonDelegate(UIButtonDelegate *delegate, bool autodelete = true);
diff --git a/screenlib/UIElementCheckbox.h b/screenlib/UIElementCheckbox.h
index 53e50bfb..eaf994ee 100644
--- a/screenlib/UIElementCheckbox.h
+++ b/screenlib/UIElementCheckbox.h
@@ -13,6 +13,8 @@ class UIElementCheckbox : public UIElementButton
return UIElementButton::IsA(type) || type == GetType();
}
+ virtual bool Load(rapidxml::xml_node<> *node, const UITemplates *templates);
+
void SetChecked(bool checked) {
if (checked != m_checked) {
m_checked = checked;
@@ -24,8 +26,6 @@ class UIElementCheckbox : public UIElementButton
}
virtual void OnChecked(bool checked) { }
- virtual bool Load(rapidxml::xml_node<> *node, const UITemplates *templates);
-
virtual void OnClick();
protected:
diff --git a/screenlib/UIElementLine.h b/screenlib/UIElementLine.h
index b2ae2237..dd5ecb4d 100644
--- a/screenlib/UIElementLine.h
+++ b/screenlib/UIElementLine.h
@@ -37,12 +37,12 @@ class UIElementLine : public UIElement
virtual bool Load(rapidxml::xml_node<> *node, const UITemplates *templates);
- virtual void Draw();
-
void SetColor(Uint32 color) {
m_color = color;
}
+ virtual void Draw();
+
private:
Uint32 m_color;
diff --git a/screenlib/UIElementRect.h b/screenlib/UIElementRect.h
index a84681fe..9cf54b02 100644
--- a/screenlib/UIElementRect.h
+++ b/screenlib/UIElementRect.h
@@ -37,12 +37,12 @@ class UIElementRect : public UIElement
virtual bool Load(rapidxml::xml_node<> *node, const UITemplates *templates);
- virtual void Draw();
-
void SetColor(Uint32 color) {
m_color = color;
}
+ virtual void Draw();
+
protected:
bool m_fill;
Uint32 m_color;