Formated all files
This commit is contained in:
parent
4dd5a1742a
commit
c119e5265a
5
.clang-format
Normal file
5
.clang-format
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
BreakBeforeBraces: Attach
|
||||||
|
IndentWidth: 4
|
||||||
|
PointerAlignment: Left
|
||||||
|
AllowShortFunctionsOnASingleLine: Inline
|
||||||
|
AccessModifierOffset: -4
|
16
.vscode/c_cpp_properties.json
vendored
Normal file
16
.vscode/c_cpp_properties.json
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Linux",
|
||||||
|
"includePath": [
|
||||||
|
"${default}"
|
||||||
|
],
|
||||||
|
"defines": [],
|
||||||
|
"compilerPath": "/usr/bin/clang",
|
||||||
|
"cStandard": "c17",
|
||||||
|
"cppStandard": "c++17",
|
||||||
|
"intelliSenseMode": "linux-clang-x64"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version": 4
|
||||||
|
}
|
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@ -75,6 +75,10 @@
|
|||||||
"thread": "cpp",
|
"thread": "cpp",
|
||||||
"typeinfo": "cpp",
|
"typeinfo": "cpp",
|
||||||
"variant": "cpp",
|
"variant": "cpp",
|
||||||
"*.xpm": "cpp"
|
"*.xpm": "cpp",
|
||||||
}
|
"cfenv": "cpp",
|
||||||
|
"charconv": "cpp",
|
||||||
|
"shared_mutex": "cpp"
|
||||||
|
},
|
||||||
|
"C_Cpp.default.cppStandard": "c++20"
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
#include "AboutDlg.h"
|
#include "AboutDlg.h"
|
||||||
|
|
||||||
AboutDlg::AboutDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("О программе"))
|
AboutDlg::AboutDlg(wxWindow* parent, wxWindowID id)
|
||||||
{
|
: wxDialog::wxDialog(parent, id, _("О программе")) {}
|
||||||
}
|
|
||||||
|
@ -3,8 +3,7 @@
|
|||||||
|
|
||||||
#include "wxw.h"
|
#include "wxw.h"
|
||||||
|
|
||||||
class AboutDlg : public wxDialog
|
class AboutDlg : public wxDialog {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
AboutDlg(wxWindow* parent, wxWindowID id);
|
AboutDlg(wxWindow* parent, wxWindowID id);
|
||||||
};
|
};
|
||||||
|
3
App.cpp
3
App.cpp
@ -3,8 +3,7 @@
|
|||||||
|
|
||||||
wxIMPLEMENT_APP(MyApp);
|
wxIMPLEMENT_APP(MyApp);
|
||||||
|
|
||||||
bool MyApp::OnInit()
|
bool MyApp::OnInit() {
|
||||||
{
|
|
||||||
wxImage::AddHandler(new wxPNGHandler());
|
wxImage::AddHandler(new wxPNGHandler());
|
||||||
|
|
||||||
MainFrame* frame = new MainFrame();
|
MainFrame* frame = new MainFrame();
|
||||||
|
3
App.h
3
App.h
@ -3,8 +3,7 @@
|
|||||||
|
|
||||||
#include "wxw.h"
|
#include "wxw.h"
|
||||||
|
|
||||||
class MyApp : public wxApp
|
class MyApp : public wxApp {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
virtual bool OnInit() override;
|
virtual bool OnInit() override;
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "HelpDlg.h"
|
#include "HelpDlg.h"
|
||||||
|
|
||||||
HelpDlg::HelpDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("Инструкция по использованию программы"))
|
HelpDlg::HelpDlg(wxWindow* parent, wxWindowID id)
|
||||||
{
|
: wxDialog::wxDialog(parent, id,
|
||||||
}
|
_("Инструкция по использованию программы")) {}
|
||||||
|
@ -3,8 +3,7 @@
|
|||||||
|
|
||||||
#include "wxw.h"
|
#include "wxw.h"
|
||||||
|
|
||||||
class HelpDlg : public wxDialog
|
class HelpDlg : public wxDialog {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
HelpDlg(wxWindow* parent, wxWindowID id);
|
HelpDlg(wxWindow* parent, wxWindowID id);
|
||||||
};
|
};
|
||||||
|
12
MainFrame.h
12
MainFrame.h
@ -5,12 +5,10 @@
|
|||||||
|
|
||||||
#include "GamePanel.h"
|
#include "GamePanel.h"
|
||||||
|
|
||||||
#include <wx/stdpaths.h>
|
|
||||||
#include <wx/filename.h>
|
#include <wx/filename.h>
|
||||||
|
#include <wx/stdpaths.h>
|
||||||
|
|
||||||
/// @uml{style[#line.dotted:blue]}
|
class MainFrame : public wxFrame {
|
||||||
class MainFrame : public wxFrame
|
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
MainFrame();
|
MainFrame();
|
||||||
|
|
||||||
@ -25,11 +23,11 @@ private:
|
|||||||
const wxString dataDirPath;
|
const wxString dataDirPath;
|
||||||
wxString layoutPath;
|
wxString layoutPath;
|
||||||
|
|
||||||
bool solveable = false; // determites wether to generate solveable or completely random map
|
bool solveable = false; // determites wether to generate solveable or
|
||||||
|
// completely random map
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum {
|
||||||
{
|
|
||||||
IDM_Open = wxID_OPEN,
|
IDM_Open = wxID_OPEN,
|
||||||
IDM_Exit = wxID_EXIT,
|
IDM_Exit = wxID_EXIT,
|
||||||
IDM_Help = wxID_HELP,
|
IDM_Help = wxID_HELP,
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
#include "RulesDlg.h"
|
#include "RulesDlg.h"
|
||||||
|
|
||||||
RulesDlg::RulesDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("Правила игры"))
|
RulesDlg::RulesDlg(wxWindow* parent, wxWindowID id)
|
||||||
{
|
: wxDialog::wxDialog(parent, id, _("Правила игры")) {}
|
||||||
}
|
|
||||||
|
@ -3,8 +3,7 @@
|
|||||||
|
|
||||||
#include "wxw.h"
|
#include "wxw.h"
|
||||||
|
|
||||||
class RulesDlg : public wxDialog
|
class RulesDlg : public wxDialog {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
RulesDlg(wxWindow* parent, wxWindowID id);
|
RulesDlg(wxWindow* parent, wxWindowID id);
|
||||||
};
|
};
|
||||||
|
16
wxw.h
16
wxw.h
@ -12,20 +12,4 @@
|
|||||||
#endif
|
#endif
|
||||||
#define _(s) wxString::FromUTF8(s)
|
#define _(s) wxString::FromUTF8(s)
|
||||||
|
|
||||||
// class wxTrackable {};
|
|
||||||
// class wxObject {};
|
|
||||||
// class wxEventHandler : wxObject, wxTrackable {};
|
|
||||||
// class wxEventFilter {};
|
|
||||||
// class wxAppConsole : wxEventHandler, wxEventFilter {};
|
|
||||||
// class wxApp : wxAppConsole {};
|
|
||||||
|
|
||||||
// class wxWindow : wxEventHandler {};
|
|
||||||
// class wxNotOwnedWindow : wxWindow {};
|
|
||||||
// class wxTopLevelWindow : wxNotOwnedWindow {};
|
|
||||||
// class wxFrame : wxTopLevelWindow {};
|
|
||||||
|
|
||||||
// class wxCommandEvent {};
|
|
||||||
|
|
||||||
// #define DECLARE_EVENT_TABLE() void none();
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user