GTK+: More consts and enums instead of #defines.

gtk/src/gtk_cheat.h

@@ -3,9 +3,12 @@
 
 #include "gtk_builder_window.h"
 
-#define TYPE_GAME_GENIE     0
-#define TYPE_ACTION_REPLAY  1
-#define TYPE_GOLDFINGER     2
+enum
+{
+    TYPE_GAME_GENIE    = 0,
+    TYPE_ACTION_REPLAY = 1,
+    TYPE_GOLDFINGER    = 2
+};
 
 class Snes9xCheats : public GtkBuilderWindow
 {

gtk/src/gtk_control.h

@@ -8,35 +8,42 @@
 #include "SDL.h"
 #endif
 
-#ifndef NUM_JOYPADS
-#define NUM_JOYPADS 10
-#endif
+const int NUM_JOYPADS = 10;
 
-#define JOY_MODE_GLOBAL     0
-#define JOY_MODE_INDIVIDUAL 1
-#define JOY_MODE_CALIBRATE  2
+enum
+{
+    JOY_MODE_GLOBAL     = 0,
+    JOY_MODE_INDIVIDUAL = 1,
+    JOY_MODE_CALIBRATE  = 2
+};
 
-#define JOY_RELEASED                0
-#define JOY_PRESSED                 1
+enum
+{
+    JOY_RELEASED = 0,
+    JOY_PRESSED  = 1
+};
 
-#define PORT_COMMAND_FULLSCREEN 1
-#define PORT_COMMAND_SAVE_SPC   2
-#define PORT_OPEN_ROM           3
-#define PORT_PAUSE              4
-#define PORT_SEEK_TO_FRAME      5
-#define PORT_QUIT               6
-#define PORT_SWAP_CONTROLLERS   7
-#define PORT_REWIND             8
-#define PORT_QUICKLOAD0         9
-#define PORT_QUICKLOAD1         10
-#define PORT_QUICKLOAD2         11
-#define PORT_QUICKLOAD3         12
-#define PORT_QUICKLOAD4         13
-#define PORT_QUICKLOAD5         14
-#define PORT_QUICKLOAD6         15
-#define PORT_QUICKLOAD7         16
-#define PORT_QUICKLOAD8         17
-#define PORT_QUICKLOAD9         18
+enum
+{
+    PORT_COMMAND_FULLSCREEN = 1,
+    PORT_COMMAND_SAVE_SPC   = 2,
+    PORT_OPEN_ROM           = 3,
+    PORT_PAUSE              = 4,
+    PORT_SEEK_TO_FRAME      = 5,
+    PORT_QUIT               = 6,
+    PORT_SWAP_CONTROLLERS   = 7,
+    PORT_REWIND             = 8,
+    PORT_QUICKLOAD0         = 9,
+    PORT_QUICKLOAD1         = 10,
+    PORT_QUICKLOAD2         = 11,
+    PORT_QUICKLOAD3         = 12,
+    PORT_QUICKLOAD4         = 13,
+    PORT_QUICKLOAD5         = 14,
+    PORT_QUICKLOAD6         = 15,
+    PORT_QUICKLOAD7         = 16,
+    PORT_QUICKLOAD8         = 17,
+    PORT_QUICKLOAD9         = 18
+};
 
 typedef struct BindingLink
 {
@@ -47,8 +54,8 @@ typedef struct BindingLink
 
 extern const BindingLink b_links[];
 extern const int b_breaks[];
-#define NUM_JOYPAD_LINKS 24
-#define NUM_EMU_LINKS    55
+const int NUM_JOYPAD_LINKS = 24;
+const int NUM_EMU_LINKS    = 55;
 
 typedef struct JoypadBinding
 {

gtk/src/gtk_display.h

@@ -13,37 +13,49 @@
 #include "filter/epx.h"
 #include "filter_epx_unsafe.h"
 
-#define FILTER_NONE                 0
-#define FILTER_SUPEREAGLE           1
-#define FILTER_2XSAI                2
-#define FILTER_SUPER2XSAI           3
-#define FILTER_EPX                  4
-#define FILTER_EPX_SMOOTH           5
-#define FILTER_NTSC                 6
-#define FILTER_SCANLINES            7
-#define FILTER_SIMPLE2X             8
-#define FILTER_SIMPLE3X             9
-#define FILTER_SIMPLE4X             10
-#define FILTER_HQ2X                 11
-#define FILTER_HQ3X                 12
-#define FILTER_HQ4X                 13
-#define FILTER_2XBRZ                14
-#define FILTER_3XBRZ                15
-#define FILTER_4XBRZ                16
-#define NUM_FILTERS                 17
+enum
+{
+    FILTER_NONE       = 0,
+    FILTER_SUPEREAGLE = 1,
+    FILTER_2XSAI      = 2,
+    FILTER_SUPER2XSAI = 3,
+    FILTER_EPX        = 4,
+    FILTER_EPX_SMOOTH = 5,
+    FILTER_NTSC       = 6,
+    FILTER_SCANLINES  = 7,
+    FILTER_SIMPLE2X   = 8,
+    FILTER_SIMPLE3X   = 9,
+    FILTER_SIMPLE4X   = 10,
+    FILTER_HQ2X       = 11,
+    FILTER_HQ3X       = 12,
+    FILTER_HQ4X       = 13,
+    FILTER_2XBRZ      = 14,
+    FILTER_3XBRZ      = 15,
+    FILTER_4XBRZ      = 16,
+    NUM_FILTERS       = 17
+};
 
-#define NTSC_COMPOSITE              0
-#define NTSC_SVIDEO                 1
-#define NTSC_RGB                    2
+enum
+{
+    NTSC_COMPOSITE = 0,
+    NTSC_SVIDEO    = 1,
+    NTSC_RGB       = 2
+};
 
-#define ENDIAN_NORMAL               0
-#define ENDIAN_SWAPPED              1
+enum
+{
+    ENDIAN_NORMAL  = 0,
+    ENDIAN_SWAPPED = 1
+};
 
-#define JOB_FILTER                  0
-#define JOB_CONVERT                 1
-#define JOB_SCALE_AND_CONVERT       2
-#define JOB_CONVERT_YUV             3
-#define JOB_CONVERT_MASK            4
+enum
+{
+    JOB_FILTER            = 0,
+    JOB_CONVERT           = 1,
+    JOB_SCALE_AND_CONVERT = 2,
+    JOB_CONVERT_YUV       = 3,
+    JOB_CONVERT_MASK      = 4
+};
 
 typedef struct thread_job_t
 {

gtk/src/gtk_display_driver_xv.h

@@ -9,7 +9,7 @@
 #include "gtk_s9x.h"
 #include "gtk_display_driver.h"
 
-#define FOURCC_YUY2 0x32595559
+const uint32 FOURCC_YUY2 = 0x32595559;
 
 class S9xXVDisplayDriver : public S9xDisplayDriver
 {

gtk/src/gtk_s9xwindow.h

@@ -3,8 +3,9 @@
 
 #include <gtk/gtk.h>
 
-#include "gtk_s9x.h"
+#include "port.h"
 #include "gtk_builder_window.h"
+#include "gtk_config.h"
 
 class Snes9xWindow : public GtkBuilderWindow
 {