piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Second and final pass of clearing out tabs.

Browse Source
This commit is contained in:
Lioncash
2014-02-16 23:51:41 -05:00
parent a8ca2c6cc2
commit 3fd87a7636
242 changed files with 1706 additions and 1702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/DolphinWX/NetWindow.h
View File

@ -43,14 +43,14 @@ private:
void MakeNetPlayDiag(int port, const std::string &game, bool is_hosting);
wxTextCtrl *m_nickname_text,
*m_host_port_text,
*m_connect_port_text,
*m_connect_ip_text;
wxTextCtrl* m_nickname_text;
wxTextCtrl* m_host_port_text;
wxTextCtrl* m_connect_port_text;
wxTextCtrl* m_connect_ip_text;
wxListBox* m_game_lbox;
wxListBox* m_game_lbox;
#ifdef USE_UPNP
wxCheckBox* m_upnp_chk;
wxCheckBox* m_upnp_chk;
#endif
const CGameListCtrl* const m_game_list;
@ -63,7 +63,7 @@ public:
, const std::string& game, const bool is_hosting = false);
~NetPlayDiag();
Common::FifoQueue<std::string> chat_msgs;
Common::FifoQueue<std::string> chat_msgs;
void OnStart(wxCommandEvent& event);
@ -94,17 +94,17 @@ private:
void GetNetSettings(NetSettings &settings);
std::string FindGame();
wxListBox* m_player_lbox;
wxTextCtrl* m_chat_text;
wxTextCtrl* m_chat_msg_text;
wxCheckBox* m_memcard_write;
wxCheckBox* m_record_chkbox;
wxListBox* m_player_lbox;
wxTextCtrl* m_chat_text;
wxTextCtrl* m_chat_msg_text;
wxCheckBox* m_memcard_write;
wxCheckBox* m_record_chkbox;
std::string m_selected_game;
wxButton* m_game_btn;
wxButton* m_start_btn;
std::string m_selected_game;
wxButton* m_game_btn;
wxButton* m_start_btn;
std::vector<int> m_playerids;
std::vector<int> m_playerids;
const CGameListCtrl* const m_game_list;
@ -119,8 +119,8 @@ public:
private:
void OnPick(wxCommandEvent& event);
wxListBox* m_game_lbox;
wxString& m_game_name;
wxListBox* m_game_lbox;
wxString& m_game_name;
};
class PadMapDiag : public wxDialog
@ -131,7 +131,7 @@ public:
private:
void OnAdjust(wxCommandEvent& event);
wxChoice* m_map_cbox[8];
wxChoice* m_map_cbox[8];
PadMapping* const m_mapping;
PadMapping* const m_wiimapping;
std::vector<const Player *>& m_player_list;