Extract button

CMakeLists.txt

@@ -199,6 +199,8 @@ add_executable(${EXECUTABLE_NAME} WIN32
     "src/plib/assoc/assoc.h"
     "src/plib/color/color.c"
     "src/plib/color/color.h"
+    "src/plib/gnw/button.c"
+    "src/plib/gnw/button.h"
     "src/plib/gnw/debug.c"
     "src/plib/gnw/debug.h"
     "src/plib/gnw/doscmdln.c"

src/core.c

@@ -1,6 +1,7 @@
 #include "core.h"
 
 #include "plib/color/color.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/dxinput.h"
 #include "draw.h"
 #include "plib/gnw/memory.h"

src/game/automap.c

@@ -19,6 +19,7 @@
 #include "plib/gnw/memory.h"
 #include "game/object.h"
 #include "plib/gnw/text.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 #define AUTOMAP_OFFSET_COUNT (AUTOMAP_MAP_COUNT * ELEVATION_COUNT)

src/game/bmpdlog.c

@@ -13,6 +13,7 @@
 #include "game/gsound.h"
 #include "game/message.h"
 #include "plib/gnw/text.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 #include "game/wordwrap.h"
 

src/game/combat.c

@@ -37,6 +37,7 @@
 #include "plib/gnw/text.h"
 #include "game/tile.h"
 #include "game/trait.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 #define CALLED_SHOT_WINDOW_X 68

src/game/display.c

@@ -14,6 +14,7 @@
 #include "game/intface.h"
 #include "plib/gnw/memory.h"
 #include "plib/gnw/text.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 // The maximum number of lines display monitor can hold. Once this value

src/game/editor.c

@@ -12,6 +12,7 @@
 #include "game/cycle.h"
 #include "db.h"
 #include "game/bmpdlog.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "draw.h"
 #include "game/game.h"

src/game/elevator.c

@@ -15,6 +15,7 @@
 #include "game/map.h"
 #include "game/pipboy.h"
 #include "game/scripts.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 // The maximum number of elevator levels.

src/game/gdialog.c

@@ -34,6 +34,7 @@
 #include "plib/gnw/text.h"
 #include "game/textobj.h"
 #include "game/tile.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 // NOTE: Rare case - as a compatibility measure with Community Edition, this

src/game/intface.c

@@ -30,6 +30,7 @@
 #include "game/stat.h"
 #include "plib/gnw/text.h"
 #include "game/tile.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 #define INDICATOR_BAR_X 0

src/game/inventry.c

@@ -13,6 +13,7 @@
 #include "core.h"
 #include "game/critter.h"
 #include "game/bmpdlog.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "int/dialog.h"
 #include "game/display.h"

src/game/loadsave.c

@@ -15,6 +15,7 @@
 #include "game/critter.h"
 #include "game/cycle.h"
 #include "game/bmpdlog.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "game/display.h"
 #include "draw.h"

src/game/mainmenu.c

@@ -12,6 +12,7 @@
 #include "game/gsound.h"
 #include "game/options.h"
 #include "game/palette.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/text.h"
 #include "game/version.h"
 

src/game/options.c

@@ -24,6 +24,7 @@
 #include "plib/gnw/text.h"
 #include "game/textobj.h"
 #include "game/tile.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 #define PREFERENCES_WINDOW_WIDTH 640

src/game/pipboy.c

@@ -12,6 +12,7 @@
 #include "game/critter.h"
 #include "game/cycle.h"
 #include "game/bmpdlog.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "draw.h"
 #include "game/game.h"

src/game/select.c

@@ -9,6 +9,7 @@
 #include "core.h"
 #include "game/critter.h"
 #include "db.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "draw.h"
 #include "game/game.h"

src/game/skilldex.c

@@ -8,6 +8,7 @@
 #include "plib/color/color.h"
 #include "core.h"
 #include "game/cycle.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "draw.h"
 #include "game/game.h"
@@ -21,6 +22,7 @@
 #include "game/skill.h"
 #include "plib/gnw/rect.h"
 #include "plib/gnw/text.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/gnw.h"
 
 #define SKILLDEX_WINDOW_RIGHT_MARGIN 4

src/game/worldmap.c

@@ -15,6 +15,7 @@
 #include "game/cycle.h"
 #include "db.h"
 #include "game/bmpdlog.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "game/display.h"
 #include "draw.h"

src/int/widget.c

@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include "int/datafile.h"
+#include "plib/gnw/button.h"
 #include "plib/gnw/debug.h"
 #include "draw.h"
 #include "plib/gnw/rect.h"