ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #795 from ChuckRozhon/correct_pointer_style_tasinputdlg 

Placed ampersands and asterisks against type name
This commit is contained in:
Lioncash 2014-08-15 08:40:37 -04:00
parent 46491ee7a4 2d920965c0
commit f6dd2ff3cb
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -46,8 +46,8 @@ EVT_CLOSE(TASInputDlg::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, TASInputDlg::TASInputDlg(wxWindow* parent, wxWindowID id, const wxString& title,
const wxPoint &position, const wxSize& size, long style) const wxPoint& position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
{ {
A_turbo = B_turbo = X_turbo = Y_turbo = Z_turbo = L_turbo = R_turbo = START_turbo = DL_turbo = DR_turbo = DD_turbo = DU_turbo = false; A_turbo = B_turbo = X_turbo = Y_turbo = Z_turbo = L_turbo = R_turbo = START_turbo = DL_turbo = DR_turbo = DD_turbo = DU_turbo = false;
@ -564,8 +564,8 @@ void TASInputDlg::GetValues(GCPadStatus* PadStatus, int controllerID)
void TASInputDlg::UpdateFromSliders(wxCommandEvent& event) void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
{ {
wxTextCtrl *text; wxTextCtrl* text;
u8 *v; u8* v;
update = 0; update = 0;
switch (event.GetId()) switch (event.GetId())
@ -573,28 +573,28 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
case ID_MAIN_X_SLIDER: case ID_MAIN_X_SLIDER:
text = wx_mainX_t; text = wx_mainX_t;
v = &mainX; v = &mainX;
xaxis =((wxSlider *) event.GetEventObject())->GetValue(); xaxis =((wxSlider*) event.GetEventObject())->GetValue();
update = 1; update = 1;
break; break;
case ID_MAIN_Y_SLIDER: case ID_MAIN_Y_SLIDER:
text = wx_mainY_t; text = wx_mainY_t;
v = &mainY; v = &mainY;
yaxis = 256 - ((wxSlider *) event.GetEventObject())->GetValue(); yaxis = 256 - ((wxSlider*) event.GetEventObject())->GetValue();
update = 1; update = 1;
break; break;
case ID_C_X_SLIDER: case ID_C_X_SLIDER:
text = wx_cX_t; text = wx_cX_t;
v = &cX; v = &cX;
c_xaxis = ((wxSlider *) event.GetEventObject())->GetValue(); c_xaxis = ((wxSlider*) event.GetEventObject())->GetValue();
update = 2; update = 2;
break; break;
case ID_C_Y_SLIDER: case ID_C_Y_SLIDER:
text = wx_cY_t; text = wx_cY_t;
v = &cY; v = &cY;
c_yaxis = 256 -((wxSlider *) event.GetEventObject())->GetValue(); c_yaxis = 256 -((wxSlider*) event.GetEventObject())->GetValue();
update = 2; update = 2;
break; break;
@ -612,7 +612,7 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
return; return;
} }
int value = ((wxSlider *) event.GetEventObject())->GetValue(); int value = ((wxSlider*) event.GetEventObject())->GetValue();
*v = (u8) value; *v = (u8) value;
text->SetValue(wxString::Format("%i", value)); text->SetValue(wxString::Format("%i", value));
@ -629,8 +629,8 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
void TASInputDlg::UpdateFromText(wxCommandEvent& event) void TASInputDlg::UpdateFromText(wxCommandEvent& event)
{ {
wxSlider *slider; wxSlider* slider;
u8 *v; u8* v;
update = 0; update = 0;
update_axis = 0; update_axis = 0;
@ -679,7 +679,7 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
} }
unsigned long value; unsigned long value;
if (((wxTextCtrl *) event.GetEventObject())->GetValue().ToULong(&value)) if (((wxTextCtrl*) event.GetEventObject())->GetValue().ToULong(&value))
{ {
*v = (u8) (value > 255 ? 255 : value); *v = (u8) (value > 255 ? 255 : value);
slider->SetValue(*v); slider->SetValue(*v);
@ -766,7 +766,7 @@ bool TASInputDlg::TextBoxHasFocus()
void TASInputDlg::OnMouseUpR(wxMouseEvent& event) void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
{ {
wxSlider *sliderX,*sliderY; wxSlider *sliderX,*sliderY;
wxStaticBitmap *sbitmap; wxStaticBitmap* sbitmap;
wxTextCtrl *textX, *textY; wxTextCtrl *textX, *textY;
int *x,*y; int *x,*y;
@ -815,7 +815,7 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
return; return;
wxSlider *sliderX,*sliderY; wxSlider *sliderX,*sliderY;
wxStaticBitmap *sbitmap; wxStaticBitmap* sbitmap;
wxTextCtrl *textX, *textY; wxTextCtrl *textX, *textY;
int *x,*y; int *x,*y;

6
Source/Core/DolphinWX/TASInputDlg.h
View File

@ -26,9 +26,9 @@ class wxWindow;
class TASInputDlg : public wxDialog class TASInputDlg : public wxDialog
{ {
public: public:
TASInputDlg(wxWindow *parent, TASInputDlg(wxWindow* parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString &title = _("TAS Input"), const wxString& title = _("TAS Input"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP); long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
@ -88,7 +88,7 @@ class TASInputDlg : public wxDialog
wxCheckBox *wx_up_button, *wx_down_button, *wx_left_button, *wx_right_button, *wx_a_button, *wx_b_button, *wx_x_button, *wx_y_button, *wx_l_button, *wx_r_button, *wx_z_button, *wx_start_button; wxCheckBox *wx_up_button, *wx_down_button, *wx_left_button, *wx_right_button, *wx_a_button, *wx_b_button, *wx_x_button, *wx_y_button, *wx_l_button, *wx_r_button, *wx_z_button, *wx_start_button;
wxTextCtrl *wx_mainX_t, *wx_mainY_t, *wx_cX_t, *wx_cY_t, *wx_l_t, *wx_r_t; wxTextCtrl *wx_mainX_t, *wx_mainY_t, *wx_cX_t, *wx_cY_t, *wx_l_t, *wx_r_t;
wxMemoryDC dc_main, dc_c; wxMemoryDC dc_main, dc_c;
wxStaticBitmap* static_bitmap_main, *static_bitmap_c; wxStaticBitmap *static_bitmap_main, *static_bitmap_c;
wxBitmap bitmap; wxBitmap bitmap;
bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo; bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo;
bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, L_button_cont, R_cont, R_button_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky; bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, L_button_cont, R_cont, R_button_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky;