mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
nJoy: GUI update
- Config GUI now uses wxWidgets (should work in linux!) - The alignment of text may look crappy in linux, so we still need to fix that. - Opening the config GUI takes time, crappy XPM image of the controller loads slow (cant we use BMP files???) (line 240) - Stupid GUI bug present when switching between a default joystick and one with no hat. (line 381) - For some reason setting the value of a wxTextCtrl doesnt gets updated immediately (line 559) - If you're using windows and dont want to use wxWidgets for the GUI, you can still use the old one by removing #define USE_WXWIDGETS from nJoy.h line 33. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@95 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -32,7 +32,6 @@
|
||||
// Set this if you want to use the new wxWidgets GUI
|
||||
#define USE_WXWIDGETS
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
@ -40,23 +39,32 @@
|
||||
#include <tchar.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_WXWIDGETS
|
||||
#include "GUI/AboutBox.h"
|
||||
#endif
|
||||
|
||||
#include <vector>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <SDL.h> // includes SDL
|
||||
|
||||
#include "Common.h"
|
||||
#ifdef _WIN32
|
||||
#define SLEEP(x) Sleep(x)
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#define SLEEP(x) usleep(x*1000)
|
||||
#endif
|
||||
|
||||
#include "pluginspecs_pad.h"
|
||||
#ifdef USE_WXWIDGETS
|
||||
#include "GUI/AboutBox.h"
|
||||
#include "GUI/ConfigBox.h"
|
||||
#else
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "Common.h"
|
||||
#include "pluginspecs_pad.h"
|
||||
#include "IniFile.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#pragma comment(lib, "SDL.lib")
|
||||
#pragma comment(lib, "comctl32.lib")
|
||||
#endif
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
Reference in New Issue
Block a user