mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-18 14:51:16 +02:00
Update to v106r52 release.
byuu says: I stand corrected, I managed to create and even larger diff than ever. This one weighs in at 309KiB `>__>` I'll have to create a changelog later, I'm too tired right now to go through all of that.
This commit is contained in:
@@ -25,7 +25,6 @@ using nall::set;
|
||||
using nall::shared_pointer;
|
||||
using nall::shared_pointer_weak;
|
||||
using nall::string;
|
||||
using nall::string_vector;
|
||||
using nall::vector;
|
||||
|
||||
namespace hiro {
|
||||
@@ -427,14 +426,14 @@ struct BrowserWindow {
|
||||
auto directory() -> string;
|
||||
auto open() -> string;
|
||||
auto save() -> string;
|
||||
auto setFilters(const string_vector& filters = {"*"}) -> type&;
|
||||
auto setFilters(const vector<string>& filters = {"*"}) -> type&;
|
||||
auto setParent(sWindow parent) -> type&;
|
||||
auto setPath(const string& path = "") -> type&;
|
||||
auto setTitle(const string& title = "") -> type&;
|
||||
|
||||
//private:
|
||||
struct State {
|
||||
string_vector filters;
|
||||
vector<string> filters;
|
||||
sWindow parent;
|
||||
string path;
|
||||
string title;
|
||||
@@ -619,7 +618,7 @@ struct mWindow : mObject {
|
||||
auto backgroundColor() const -> Color;
|
||||
auto dismissable() const -> bool;
|
||||
auto doClose() const -> void;
|
||||
auto doDrop(string_vector) const -> void;
|
||||
auto doDrop(vector<string>) const -> void;
|
||||
auto doKeyPress(int) const -> void;
|
||||
auto doKeyRelease(int) const -> void;
|
||||
auto doMove() const -> void;
|
||||
@@ -635,7 +634,7 @@ struct mWindow : mObject {
|
||||
auto minimumSize() const -> Size;
|
||||
auto modal() const -> bool;
|
||||
auto onClose(const function<void ()>& callback = {}) -> type&;
|
||||
auto onDrop(const function<void (string_vector)>& callback = {}) -> type&;
|
||||
auto onDrop(const function<void (vector<string>)>& callback = {}) -> type&;
|
||||
auto onKeyPress(const function<void (int)>& callback = {}) -> type&;
|
||||
auto onKeyRelease(const function<void (int)>& callback = {}) -> type&;
|
||||
auto onMove(const function<void ()>& callback = {}) -> type&;
|
||||
@@ -683,7 +682,7 @@ struct mWindow : mObject {
|
||||
sMenuBar menuBar;
|
||||
bool modal = false;
|
||||
function<void ()> onClose;
|
||||
function<void (string_vector)> onDrop;
|
||||
function<void (vector<string>)> onDrop;
|
||||
function<void (int)> onKeyPress;
|
||||
function<void (int)> onKeyRelease;
|
||||
function<void ()> onMove;
|
||||
@@ -934,14 +933,14 @@ struct mCanvas : mWidget {
|
||||
auto color() const -> Color;
|
||||
auto data() -> uint32_t*;
|
||||
auto droppable() const -> bool;
|
||||
auto doDrop(string_vector names) const -> void;
|
||||
auto doDrop(vector<string> names) const -> void;
|
||||
auto doMouseLeave() const -> void;
|
||||
auto doMouseMove(Position position) const -> void;
|
||||
auto doMousePress(Mouse::Button button) const -> void;
|
||||
auto doMouseRelease(Mouse::Button button) const -> void;
|
||||
auto gradient() const -> Gradient;
|
||||
auto icon() const -> image;
|
||||
auto onDrop(const function<void (string_vector)>& callback = {}) -> type&;
|
||||
auto onDrop(const function<void (vector<string>)>& callback = {}) -> type&;
|
||||
auto onMouseLeave(const function<void ()>& callback = {}) -> type&;
|
||||
auto onMouseMove(const function<void (Position)>& callback = {}) -> type&;
|
||||
auto onMousePress(const function<void (Mouse::Button)>& callback = {}) -> type&;
|
||||
@@ -960,7 +959,7 @@ struct mCanvas : mWidget {
|
||||
bool droppable = false;
|
||||
Gradient gradient;
|
||||
image icon;
|
||||
function<void (string_vector)> onDrop;
|
||||
function<void (vector<string>)> onDrop;
|
||||
function<void ()> onMouseLeave;
|
||||
function<void (Position)> onMouseMove;
|
||||
function<void (Mouse::Button)> onMousePress;
|
||||
@@ -1908,14 +1907,14 @@ struct mVerticalSlider : mWidget {
|
||||
struct mViewport : mWidget {
|
||||
Declare(Viewport)
|
||||
|
||||
auto doDrop(string_vector names) const -> void;
|
||||
auto doDrop(vector<string> names) const -> void;
|
||||
auto doMouseLeave() const -> void;
|
||||
auto doMouseMove(Position position) const -> void;
|
||||
auto doMousePress(Mouse::Button button) const -> void;
|
||||
auto doMouseRelease(Mouse::Button button) const -> void;
|
||||
auto droppable() const -> bool;
|
||||
auto handle() const -> uintptr_t;
|
||||
auto onDrop(const function<void (string_vector)>& callback = {}) -> type&;
|
||||
auto onDrop(const function<void (vector<string>)>& callback = {}) -> type&;
|
||||
auto onMouseLeave(const function<void ()>& callback = {}) -> type&;
|
||||
auto onMouseMove(const function<void (Position position)>& callback = {}) -> type&;
|
||||
auto onMousePress(const function<void (Mouse::Button)>& callback = {}) -> type&;
|
||||
@@ -1925,7 +1924,7 @@ struct mViewport : mWidget {
|
||||
//private:
|
||||
struct State {
|
||||
bool droppable = false;
|
||||
function<void (string_vector)> onDrop;
|
||||
function<void (vector<string>)> onDrop;
|
||||
function<void ()> onMouseLeave;
|
||||
function<void (Position)> onMouseMove;
|
||||
function<void (Mouse::Button)> onMousePress;
|
||||
|
Reference in New Issue
Block a user