summaryrefslogtreecommitdiff
path: root/src/gui/base/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/base/widgets')
-rw-r--r--src/gui/base/widgets/button.cpp4
-rw-r--r--src/gui/base/widgets/button.hpp2
-rw-r--r--src/gui/base/widgets/checkbox.cpp4
-rw-r--r--src/gui/base/widgets/checkbox.hpp3
-rw-r--r--src/gui/base/widgets/listbox.cpp4
-rw-r--r--src/gui/base/widgets/listbox.hpp5
-rw-r--r--src/gui/base/widgets/radiobutton.cpp4
-rw-r--r--src/gui/base/widgets/radiobutton.hpp3
-rw-r--r--src/gui/base/widgets/slider.cpp4
-rw-r--r--src/gui/base/widgets/slider.hpp3
-rw-r--r--src/gui/base/widgets/textbox.cpp4
-rw-r--r--src/gui/base/widgets/textbox.hpp3
-rw-r--r--src/gui/base/widgets/textfield.cpp4
-rw-r--r--src/gui/base/widgets/textfield.hpp3
14 files changed, 28 insertions, 22 deletions
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 82ff878a0..4631ed80f 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -82,7 +82,7 @@ namespace gcn
Button::Button() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
FocusListener(),
mCaption(),
mHasMouse(false),
@@ -103,7 +103,7 @@ namespace gcn
Button::Button(const std::string& caption) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
FocusListener(),
mCaption(caption),
mHasMouse(false),
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index e2d6c0c8e..779a75aa5 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -67,7 +67,7 @@
#include <string>
#include "listeners/focuslistener.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
#include "gui/base/mouseevent.hpp"
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index 615808a85..ceb59a1eb 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -81,7 +81,7 @@ namespace gcn
CheckBox::CheckBox() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(false),
mCaption()
{
@@ -93,7 +93,7 @@ namespace gcn
CheckBox::CheckBox(const std::string &caption, bool selected) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(selected),
mCaption()
{
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index c9b723879..4904a022f 100644
--- a/src/gui/base/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -66,8 +66,9 @@
#include <string>
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
namespace gcn
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index dcf443c77..771f22f64 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -83,7 +83,7 @@ namespace gcn
ListBox::ListBox() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(-1),
mListModel(nullptr),
mWrappingEnabled(false),
@@ -99,7 +99,7 @@ namespace gcn
ListBox::ListBox(ListModel *listModel) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(-1),
mListModel(listModel),
mWrappingEnabled(false),
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index f2780f130..11983262f 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -66,11 +66,12 @@
#include <list>
-#include "gui/base/keylistener.hpp"
#include "gui/base/listmodel.hpp"
-#include "gui/base/mouselistener.hpp"
#include "gui/base/widget.hpp"
+#include "listeners/keylistener.h"
+#include "gui/base/mouselistener.hpp"
+
namespace gcn
{
class SelectionListener;
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index 1e1da2622..f7145fd55 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -82,7 +82,7 @@ namespace gcn
RadioButton::RadioButton() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(false),
mCaption(),
mGroup()
@@ -99,7 +99,7 @@ namespace gcn
bool selected) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mSelected(false),
mCaption(),
mGroup()
diff --git a/src/gui/base/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index 07e3d656a..98b562676 100644
--- a/src/gui/base/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -67,8 +67,9 @@
#include <map>
#include <string>
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
namespace gcn
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index e9ab36e86..2a3fb8c24 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -79,7 +79,7 @@ namespace gcn
Slider::Slider(const double scaleEnd) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mDragged(false),
mValue(0),
mStepLength(scaleEnd / 10),
@@ -98,7 +98,7 @@ namespace gcn
Slider::Slider(const double scaleStart, const double scaleEnd) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mDragged(false),
mValue(scaleStart),
mStepLength((scaleEnd - scaleStart) / 10),
diff --git a/src/gui/base/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp
index 32cdfefb9..fa047a739 100644
--- a/src/gui/base/widgets/slider.hpp
+++ b/src/gui/base/widgets/slider.hpp
@@ -64,8 +64,9 @@
#ifndef GCN_SLIDER_HPP
#define GCN_SLIDER_HPP
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
namespace gcn
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index 411fc7dd5..c146c4f08 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -81,7 +81,7 @@ namespace gcn
TextBox::TextBox() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mTextRows(),
mCaretColumn(0),
mCaretRow(0),
@@ -99,7 +99,7 @@ namespace gcn
TextBox::TextBox(const std::string& text) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mTextRows(),
mCaretColumn(0),
mCaretRow(0),
diff --git a/src/gui/base/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index 0a540a2c1..894616360 100644
--- a/src/gui/base/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -68,8 +68,9 @@
#include <string>
#include <vector>
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
namespace gcn
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 3349ebccb..178a012b7 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -80,7 +80,7 @@ namespace gcn
TextField::TextField() :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mText(),
mCaretPosition(0),
mXScroll(0)
@@ -94,7 +94,7 @@ namespace gcn
TextField::TextField(const std::string& text) :
gcn::Widget(),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mText(text),
mCaretPosition(0),
mXScroll(0)
diff --git a/src/gui/base/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp
index bc227eb55..56d60b7aa 100644
--- a/src/gui/base/widgets/textfield.hpp
+++ b/src/gui/base/widgets/textfield.hpp
@@ -64,8 +64,9 @@
#ifndef GCN_TEXTFIELD_HPP
#define GCN_TEXTFIELD_HPP
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
#include <string>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 22:37:32 +0000