mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 17:49:14 +00:00
change a few names for some of the control callbacks
This commit is contained in:
parent
b0df5cf29c
commit
1e6c518700
|
@ -16,20 +16,21 @@
|
|||
******************************************************************************/
|
||||
|
||||
#include "obs-app.hpp"
|
||||
#include "window-settings-basic.hpp"
|
||||
#include "window-main-basic.hpp"
|
||||
|
||||
void OBSBasic::OnClose(wxCloseEvent& event)
|
||||
void OBSBasic::OnClose(wxCloseEvent &event)
|
||||
{
|
||||
wxGetApp().ExitMainLoop();
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void OBSBasic::OnMinimize(wxIconizeEvent& event)
|
||||
void OBSBasic::OnMinimize(wxIconizeEvent &event)
|
||||
{
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void OBSBasic::OnSize(wxSizeEvent& event)
|
||||
void OBSBasic::OnSize(wxSizeEvent &event)
|
||||
{
|
||||
struct obs_video_info ovi;
|
||||
|
||||
|
@ -51,72 +52,78 @@ void OBSBasic::OnSize(wxSizeEvent& event)
|
|||
targetSize.x / baseAspect));
|
||||
}
|
||||
|
||||
void OBSBasic::file_newOnMenuSelection(wxCommandEvent& event)
|
||||
void OBSBasic::fileNewClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::file_openOnMenuSelection(wxCommandEvent& event)
|
||||
void OBSBasic::fileOpenClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::file_saveOnMenuSelection(wxCommandEvent& event)
|
||||
void OBSBasic::fileSaveClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::file_exitOnMenuSelection(wxCommandEvent& event)
|
||||
void OBSBasic::fileExitClicked(wxCommandEvent &event)
|
||||
{
|
||||
wxGetApp().ExitMainLoop();
|
||||
}
|
||||
|
||||
void OBSBasic::scenesOnRightDown(wxMouseEvent& event)
|
||||
void OBSBasic::scenesRDown(wxMouseEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sceneAddOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sceneAddClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sceneRemoveOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sceneRemoveClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::scenePropertiesOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::scenePropertiesClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sceneUpOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sceneUpClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sceneDownOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sceneDownClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourcesOnRightDown(wxMouseEvent& event)
|
||||
void OBSBasic::sourcesRDown(wxMouseEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourceAddOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourceAddClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourceRemoveOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourceRemoveClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourcePropertiesOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourcePropertiesClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourceUpOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourceUpClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::sourceDownOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourceDownClicked(wxCommandEvent &event)
|
||||
{
|
||||
}
|
||||
|
||||
void OBSBasic::exitButtonOnButtonClick(wxCommandEvent& event)
|
||||
void OBSBasic::settingsClicked(wxCommandEvent &event)
|
||||
{
|
||||
OBSBasicSettings *test = new OBSBasicSettings(this);
|
||||
test->ShowModal();
|
||||
}
|
||||
|
||||
void OBSBasic::exitClicked(wxCommandEvent &event)
|
||||
{
|
||||
wxGetApp().ExitMainLoop();
|
||||
}
|
||||
|
|
|
@ -21,26 +21,27 @@
|
|||
|
||||
class OBSBasic : public OBSBasicBase {
|
||||
protected:
|
||||
virtual void OnClose(wxCloseEvent& event);
|
||||
virtual void OnMinimize(wxIconizeEvent& event);
|
||||
virtual void OnSize(wxSizeEvent& event);
|
||||
virtual void file_newOnMenuSelection(wxCommandEvent& event);
|
||||
virtual void file_openOnMenuSelection(wxCommandEvent& event);
|
||||
virtual void file_saveOnMenuSelection(wxCommandEvent& event);
|
||||
virtual void file_exitOnMenuSelection(wxCommandEvent& event);
|
||||
virtual void scenesOnRightDown(wxMouseEvent& event);
|
||||
virtual void sceneAddOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sceneRemoveOnToolClicked(wxCommandEvent& event);
|
||||
virtual void scenePropertiesOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sceneUpOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sceneDownOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sourcesOnRightDown(wxMouseEvent& event);
|
||||
virtual void sourceAddOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sourceRemoveOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sourcePropertiesOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sourceUpOnToolClicked(wxCommandEvent& event);
|
||||
virtual void sourceDownOnToolClicked(wxCommandEvent& event);
|
||||
virtual void exitButtonOnButtonClick(wxCommandEvent& event);
|
||||
virtual void OnClose(wxCloseEvent &event);
|
||||
virtual void OnMinimize(wxIconizeEvent &event);
|
||||
virtual void OnSize(wxSizeEvent &event);
|
||||
virtual void fileNewClicked(wxCommandEvent &event);
|
||||
virtual void fileOpenClicked(wxCommandEvent &event);
|
||||
virtual void fileSaveClicked(wxCommandEvent &event);
|
||||
virtual void fileExitClicked(wxCommandEvent &event);
|
||||
virtual void scenesRDown(wxMouseEvent &event);
|
||||
virtual void sceneAddClicked(wxCommandEvent &event);
|
||||
virtual void sceneRemoveClicked(wxCommandEvent &event);
|
||||
virtual void scenePropertiesClicked(wxCommandEvent &event);
|
||||
virtual void sceneUpClicked(wxCommandEvent &event);
|
||||
virtual void sceneDownClicked(wxCommandEvent &event);
|
||||
virtual void sourcesRDown(wxMouseEvent &event);
|
||||
virtual void sourceAddClicked(wxCommandEvent &event);
|
||||
virtual void sourceRemoveClicked(wxCommandEvent &event);
|
||||
virtual void sourcePropertiesClicked(wxCommandEvent &event);
|
||||
virtual void sourceUpClicked(wxCommandEvent &event);
|
||||
virtual void sourceDownClicked(wxCommandEvent &event);
|
||||
virtual void settingsClicked(wxCommandEvent &event);
|
||||
virtual void exitClicked(wxCommandEvent &event);
|
||||
|
||||
public:
|
||||
inline OBSBasic() : OBSBasicBase(NULL) {}
|
||||
|
|
Loading…
Reference in a new issue