diff options
| author | Thales1330 <thaleslima.ufu@gmail.com> | 2016-08-01 18:05:11 -0300 |
|---|---|---|
| committer | Thales1330 <thaleslima.ufu@gmail.com> | 2016-08-01 18:05:11 -0300 |
| commit | 5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7 (patch) | |
| tree | c3fd7d83e604abaf5f62ab732e9a2383c0def5e0 /Project | |
| parent | 3a246308dcd76f70a1b6c3e6b08f0d597b255dba (diff) | |
| download | PSP.git-5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7.tar.gz PSP.git-5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7.tar.xz PSP.git-5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7.zip | |
Attempt to implement Event Handler in Workspace
fail
Diffstat (limited to 'Project')
30 files changed, 563 insertions, 1324 deletions
diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index ddd2247..7099b76 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -3,8 +3,8 @@ MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) { m_locale = locale; - - Init(); + + Init(); } MainFrame::~MainFrame() { @@ -17,8 +17,8 @@ MainFrame::~MainFrame() } void MainFrame::Init() { - this->SetSize(800, 600); - + this->SetSize(800, 600); + CreateAddElementsMenu(); EnableCurrentProjectRibbon(false); @@ -99,15 +99,19 @@ void MainFrame::CreateAddElementsMenu() void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) { - EnableCurrentProjectRibbon(); - - Workspace* newWorkspace = new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); - m_workspaceList.push_back(newWorkspace); - - m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName()); - newWorkspace->Layout(); - newWorkspace->Redraw(); - m_projectNumber++; + EnableCurrentProjectRibbon(); + + Workspace* newWorkspace = + new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber, m_projectNumber)); + m_workspaceList.push_back(newWorkspace); + + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_ENABLESOL, false); + + m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName(), true); + newWorkspace->Layout(); + newWorkspace->Redraw(); + m_projectNumber++; } void MainFrame::OnAboutClick(wxRibbonButtonBarEvent& event) {} @@ -152,32 +156,53 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) { switch(event.GetId()) { - case ID_ADDMENU_BUS: - // inserir barra - break; - case ID_ADDMENU_LINE: - // inserir linha - break; - case ID_ADDMENU_TRANSFORMER: - // inserir transformador - break; - case ID_ADDMENU_GENERATOR: - // inserir gerador - break; - case ID_ADDMENU_LOAD: - // inserir larga - break; - case ID_ADDMENU_CAPACITOR: - // inserir capacitor - break; - case ID_ADDMENU_INDUCTOR: - // inserir indutor - break; - case ID_ADDMENU_INDMOTOR: - // inserir motor - break; - case ID_ADDMENU_SYNCCOMP: - // inserir compensador sincrono - break; + case ID_ADDMENU_BUS: + // inserir barra + break; + case ID_ADDMENU_LINE: + // inserir linha + break; + case ID_ADDMENU_TRANSFORMER: + // inserir transformador + break; + case ID_ADDMENU_GENERATOR: + // inserir gerador + break; + case ID_ADDMENU_LOAD: + // inserir larga + break; + case ID_ADDMENU_CAPACITOR: + // inserir capacitor + break; + case ID_ADDMENU_INDUCTOR: + // inserir indutor + break; + case ID_ADDMENU_INDMOTOR: + // inserir motor + break; + case ID_ADDMENU_SYNCCOMP: + // inserir compensador sincrono + break; + } +} +void MainFrame::NotebookPageClosed(wxAuiNotebookEvent& event) +{ + if(m_auiNotebook->GetPageCount() == 0) EnableCurrentProjectRibbon(false); + //Memory leak? +} +void MainFrame::NotebookPageClosing(wxAuiNotebookEvent& event) +{ + std::vector<Workspace*>::iterator it = m_workspaceList.begin(); + while(it != m_workspaceList.end()) { + Workspace* workspace = *it; + + if(event.GetSelection() == m_auiNotebook->GetPageIndex(workspace)) { + //delete workspace; //Memory leak? + m_workspaceList.erase(it); + wxMessageBox(wxString::Format("%d", m_workspaceList.size())); + break; + } + it++; } + event.Skip(); } diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 2b54414..8459926 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -28,6 +28,8 @@ class MainFrame : public MainFrameBase ~MainFrame(); protected: + virtual void NotebookPageClosed(wxAuiNotebookEvent& event); + virtual void NotebookPageClosing(wxAuiNotebookEvent& event); virtual void OnAboutClick(wxRibbonButtonBarEvent& event); virtual void OnAddElementDropdown(wxRibbonButtonBarEvent& event); virtual void OnChartsClick(wxRibbonButtonBarEvent& event); diff --git a/Project/MainFrame.wxcp b/Project/MainFrame.wxcp index 868d1d5..1b863dd 100644 --- a/Project/MainFrame.wxcp +++ b/Project/MainFrame.wxcp @@ -4735,7 +4735,21 @@ "m_label": "Style:", "m_value": "" }], - "m_events": [], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", + "m_eventClass": "wxAuiNotebookEvent", + "m_eventHandler": "wxAuiNotebookEventHandler", + "m_functionNameAndSignature": "NotebookPageClosing(wxAuiNotebookEvent& event)", + "m_description": "A page is about to be closed", + "m_noBody": false + }, { + "m_eventName": "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED", + "m_eventClass": "wxAuiNotebookEvent", + "m_eventHandler": "wxAuiNotebookEventHandler", + "m_functionNameAndSignature": "NotebookPageClosed(wxAuiNotebookEvent& event)", + "m_description": "A page has been closed", + "m_noBody": false + }], "m_children": [] }] }] diff --git a/Project/MainFrameBase.cpp b/Project/MainFrameBase.cpp index 3ef4360..3778e7e 100644 --- a/Project/MainFrameBase.cpp +++ b/Project/MainFrameBase.cpp @@ -277,6 +277,8 @@ MainFrameBase::MainFrameBase(wxWindow* parent, wxWindowID id, const wxString& ti m_ribbonButtonBarStability->Connect(ID_RIBBON_STABSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnStabilitySettingsClick), NULL, this); m_ribbonButtonBarStability->Connect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnRunStabilityClick), NULL, this); m_ribbonButtonBarStabData->Connect(ID_RIBBON_CHARTS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnChartsClick), NULL, this); + m_auiNotebook->Connect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler(MainFrameBase::NotebookPageClosing), NULL, this); + m_auiNotebook->Connect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEventHandler(MainFrameBase::NotebookPageClosed), NULL, this); } @@ -312,5 +314,7 @@ MainFrameBase::~MainFrameBase() m_ribbonButtonBarStability->Disconnect(ID_RIBBON_STABSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnStabilitySettingsClick), NULL, this); m_ribbonButtonBarStability->Disconnect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnRunStabilityClick), NULL, this); m_ribbonButtonBarStabData->Disconnect(ID_RIBBON_CHARTS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnChartsClick), NULL, this); + m_auiNotebook->Disconnect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler(MainFrameBase::NotebookPageClosing), NULL, this); + m_auiNotebook->Disconnect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEventHandler(MainFrameBase::NotebookPageClosed), NULL, this); } diff --git a/Project/MainFrameBase.h b/Project/MainFrameBase.h index 783554b..f339d35 100644 --- a/Project/MainFrameBase.h +++ b/Project/MainFrameBase.h @@ -132,6 +132,8 @@ protected: virtual void OnStabilitySettingsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnRunStabilityClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnChartsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } + virtual void NotebookPageClosing(wxAuiNotebookEvent& event) { event.Skip(); } + virtual void NotebookPageClosed(wxAuiNotebookEvent& event) { event.Skip(); } public: wxRibbonBar* GetRibbonBar() { return m_ribbonBar; } diff --git a/Project/MouseEventsHandler.cpp b/Project/MouseEventsHandler.cpp new file mode 100644 index 0000000..ad59774 --- /dev/null +++ b/Project/MouseEventsHandler.cpp @@ -0,0 +1,21 @@ +#include "MouseEventsHandler.h" + +MouseEventsHandler::MouseEventsHandler(Workspace* workspace) : Workspace(workspace) +{ + m_workspace = workspace; +} + +MouseEventsHandler::~MouseEventsHandler() +{ +} + +void MouseEventsHandler::OnKeyDown(wxKeyEvent& event) +{ + if(event.GetKeyCode() == 'B' && !m_workspace->m_insertMode) { + Bus* newBus = new Bus(m_workspace->m_camera->ScreenToWorld(event.GetPosition())); + m_workspace->m_elementList.push_back(newBus); + m_workspace->m_insertMode = true; + m_workspace->Redraw(); + } + event.Skip(); +} diff --git a/Project/MouseEventsHandler.h b/Project/MouseEventsHandler.h new file mode 100644 index 0000000..ab5680a --- /dev/null +++ b/Project/MouseEventsHandler.h @@ -0,0 +1,18 @@ +#ifndef MOUSEEVENTSHANDLER_H +#define MOUSEEVENTSHANDLER_H + +#include "Workspace.h" + +class MouseEventsHandler : public Workspace +{ +private: + Workspace* m_workspace; +public: + MouseEventsHandler(Workspace* workspace); + ~MouseEventsHandler(); + + void OnKeyDown(wxKeyEvent& event); + +}; + +#endif // MOUSEEVENTSHANDLER_H diff --git a/Project/Project.mk b/Project/Project.mk index df6bc22..fd1ea61 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,8 +13,8 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=Thales -Date :=29/07/2016 -CodeLitePath :="C:/Program Files (x86)/CodeLite" +Date :=01/08/2016 +CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC ObjectSuffix :=.o @@ -61,12 +61,11 @@ AS := C:/TDM-GCC-64/bin/as.exe ## ## User defined environment variables ## -CodeLiteDir:=C:\Program Files (x86)\CodeLite -UNIT_TEST_PP_SRC_DIR:=C:\UnitTest++-1.3 +CodeLiteDir:=C:\Program Files\CodeLite WXWIN:=C:\wxWidgets-3.1.0 WXCFG:=gcc_dll\mswu -Objects0=$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) +Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/MouseEventsHandler.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) @@ -97,6 +96,14 @@ PreBuild: ## ## Objects ## +$(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM main.cpp + +$(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix)main.cpp + $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix): win_resources.rc $(RcCompilerName) -i "C:/Users/Thales/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix): Element.cpp $(IntermediateDirectory)/Element.cpp$(DependSuffix) @@ -131,14 +138,6 @@ $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix): MainFrame.cpp $(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix): MainFrame.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix)MainFrame.cpp -$(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM main.cpp - -$(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix)main.cpp - $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix): Workspace.cpp $(IntermediateDirectory)/Workspace.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Workspace.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/Workspace.cpp$(DependSuffix): Workspace.cpp @@ -147,6 +146,14 @@ $(IntermediateDirectory)/Workspace.cpp$(DependSuffix): Workspace.cpp $(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix): Workspace.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix)Workspace.cpp +$(IntermediateDirectory)/MouseEventsHandler.cpp$(ObjectSuffix): MouseEventsHandler.cpp $(IntermediateDirectory)/MouseEventsHandler.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/MouseEventsHandler.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MouseEventsHandler.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/MouseEventsHandler.cpp$(DependSuffix): MouseEventsHandler.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MouseEventsHandler.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MouseEventsHandler.cpp$(DependSuffix) -MM MouseEventsHandler.cpp + +$(IntermediateDirectory)/MouseEventsHandler.cpp$(PreprocessSuffix): MouseEventsHandler.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MouseEventsHandler.cpp$(PreprocessSuffix)MouseEventsHandler.cpp + $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix): MainFrameBitmaps.cpp $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix): MainFrameBitmaps.cpp diff --git a/Project/Project.project b/Project/Project.project index 0752f78..daff168 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -17,9 +17,10 @@ </VirtualDirectory> <VirtualDirectory Name="controller"> <File Name="MainFrame.cpp"/> - <File Name="main.cpp"/> <File Name="Workspace.cpp"/> + <File Name="MouseEventsHandler.cpp"/> </VirtualDirectory> + <File Name="main.cpp"/> </VirtualDirectory> <VirtualDirectory Name="include"> <VirtualDirectory Name="model"> @@ -32,6 +33,7 @@ <VirtualDirectory Name="controller"> <File Name="MainFrame.h"/> <File Name="Workspace.h"/> + <File Name="MouseEventsHandler.h"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="resources"> diff --git a/Project/Release/MainFrame.cpp.o b/Project/Release/MainFrame.cpp.o Binary files differdeleted file mode 100644 index e92e5a1..0000000 --- a/Project/Release/MainFrame.cpp.o +++ /dev/null diff --git a/Project/Release/MainFrame.cpp.o.d b/Project/Release/MainFrame.cpp.o.d index 537526d..267f9fb 100644 --- a/Project/Release/MainFrame.cpp.o.d +++ b/Project/Release/MainFrame.cpp.o.d @@ -205,7 +205,7 @@ Release/MainFrame.cpp.o: MainFrame.cpp MainFrame.h \ C:/wxWidgets-3.1.0/include/wx/log.h \ C:/wxWidgets-3.1.0/include/wx/generic/logg.h \ C:/wxWidgets-3.1.0/include/wx/msw/app.h \ - C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h + C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h Bus.h Element.h MainFrame.h: @@ -632,3 +632,7 @@ C:/wxWidgets-3.1.0/include/wx/generic/logg.h: C:/wxWidgets-3.1.0/include/wx/msw/app.h: C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h: + +Bus.h: + +Element.h: diff --git a/Project/Release/MainFrameBase.cpp.o b/Project/Release/MainFrameBase.cpp.o Binary files differindex 357f264..a05fded 100644 --- a/Project/Release/MainFrameBase.cpp.o +++ b/Project/Release/MainFrameBase.cpp.o diff --git a/Project/Release/wxcrafter.cpp.o.d b/Project/Release/MouseEventsHandler.cpp.o.d index 9172536..b99bd3d 100644 --- a/Project/Release/wxcrafter.cpp.o.d +++ b/Project/Release/MouseEventsHandler.cpp.o.d @@ -1,6 +1,9 @@ -Release/wxcrafter.cpp.o: wxcrafter.cpp wxcrafter.h \ - C:/wxWidgets-3.1.0/include/wx/settings.h \ - C:/wxWidgets-3.1.0/include/wx/colour.h \ +Release/MouseEventsHandler.cpp.o: MouseEventsHandler.cpp \ + MouseEventsHandler.h Workspace.h \ + C:/wxWidgets-3.1.0/include/wx/dcclient.h \ + C:/wxWidgets-3.1.0/include/wx/dc.h \ + C:/wxWidgets-3.1.0/include/wx/object.h \ + C:/wxWidgets-3.1.0/include/wx/memory.h \ C:/wxWidgets-3.1.0/include/wx/defs.h \ C:/wxWidgets-3.1.0/include/wx/platform.h \ C:/wxWidgets-3.1.0/include/wx/compiler.h \ @@ -17,9 +20,6 @@ Release/wxcrafter.cpp.o: wxcrafter.cpp wxcrafter.h \ C:/wxWidgets-3.1.0/include/wx/windowid.h \ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \ C:/wxWidgets-3.1.0/include/wx/features.h \ - C:/wxWidgets-3.1.0/include/wx/gdiobj.h \ - C:/wxWidgets-3.1.0/include/wx/object.h \ - C:/wxWidgets-3.1.0/include/wx/memory.h \ C:/wxWidgets-3.1.0/include/wx/string.h \ C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h \ C:/wxWidgets-3.1.0/include/wx/strvararg.h \ @@ -36,6 +36,15 @@ Release/wxcrafter.cpp.o: wxcrafter.cpp wxcrafter.h \ C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \ C:/wxWidgets-3.1.0/include/wx/flags.h \ C:/wxWidgets-3.1.0/include/wx/xti2.h \ + C:/wxWidgets-3.1.0/include/wx/intl.h \ + C:/wxWidgets-3.1.0/include/wx/translation.h \ + C:/wxWidgets-3.1.0/include/wx/language.h \ + C:/wxWidgets-3.1.0/include/wx/hashmap.h \ + C:/wxWidgets-3.1.0/include/wx/wxcrt.h \ + C:/wxWidgets-3.1.0/include/wx/scopedptr.h \ + C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \ + C:/wxWidgets-3.1.0/include/wx/colour.h \ + C:/wxWidgets-3.1.0/include/wx/gdiobj.h \ C:/wxWidgets-3.1.0/include/wx/variant.h \ C:/wxWidgets-3.1.0/include/wx/arrstr.h \ C:/wxWidgets-3.1.0/include/wx/list.h \ @@ -54,24 +63,12 @@ Release/wxcrafter.cpp.o: wxcrafter.cpp wxcrafter.h \ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \ C:/wxWidgets-3.1.0/include/wx/font.h \ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \ - C:/wxWidgets-3.1.0/include/wx/hashmap.h \ - C:/wxWidgets-3.1.0/include/wx/wxcrt.h \ C:/wxWidgets-3.1.0/include/wx/math.h \ C:/wxWidgets-3.1.0/include/wx/msw/font.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ - C:/wxWidgets-3.1.0/include/wx/filesys.h \ - C:/wxWidgets-3.1.0/include/wx/stream.h \ - C:/wxWidgets-3.1.0/include/wx/filefn.h \ - C:/wxWidgets-3.1.0/include/wx/filename.h \ - C:/wxWidgets-3.1.0/include/wx/intl.h \ - C:/wxWidgets-3.1.0/include/wx/translation.h \ - C:/wxWidgets-3.1.0/include/wx/language.h \ - C:/wxWidgets-3.1.0/include/wx/scopedptr.h \ - C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \ - C:/wxWidgets-3.1.0/include/wx/file.h \ - C:/wxWidgets-3.1.0/include/wx/convauto.h \ C:/wxWidgets-3.1.0/include/wx/bitmap.h \ C:/wxWidgets-3.1.0/include/wx/image.h \ + C:/wxWidgets-3.1.0/include/wx/stream.h \ + C:/wxWidgets-3.1.0/include/wx/filefn.h \ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \ C:/wxWidgets-3.1.0/include/wx/imagpng.h \ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \ @@ -87,68 +84,116 @@ Release/wxcrafter.cpp.o: wxcrafter.cpp wxcrafter.h \ C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \ C:/wxWidgets-3.1.0/include/wx/palette.h \ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \ - C:/wxWidgets-3.1.0/include/wx/icon.h \ - C:/wxWidgets-3.1.0/include/wx/iconloc.h \ - C:/wxWidgets-3.1.0/include/wx/msw/icon.h \ - C:/wxWidgets-3.1.0/include/wx/artprov.h \ - C:/wxWidgets-3.1.0/include/wx/iconbndl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \ - C:/wxWidgets-3.1.0/include/wx/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/window.h \ - C:/wxWidgets-3.1.0/include/wx/event.h \ - C:/wxWidgets-3.1.0/include/wx/clntdata.h \ - C:/wxWidgets-3.1.0/include/wx/cursor.h \ - C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \ + C:/wxWidgets-3.1.0/include/wx/brush.h \ + C:/wxWidgets-3.1.0/include/wx/msw/brush.h \ + C:/wxWidgets-3.1.0/include/wx/pen.h \ + C:/wxWidgets-3.1.0/include/wx/msw/pen.h \ + C:/wxWidgets-3.1.0/include/wx/region.h \ + C:/wxWidgets-3.1.0/include/wx/msw/region.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \ + C:/wxWidgets-3.1.0/include/wx/geometry.h \ C:/wxWidgets-3.1.0/include/wx/utils.h \ C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \ C:/wxWidgets-3.1.0/include/wx/mousestate.h \ C:/wxWidgets-3.1.0/include/wx/kbdstate.h \ C:/wxWidgets-3.1.0/include/wx/platinfo.h \ + C:/wxWidgets-3.1.0/include/wx/msgdlg.h \ + C:/wxWidgets-3.1.0/include/wx/dialog.h \ + C:/wxWidgets-3.1.0/include/wx/toplevel.h \ + C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \ + C:/wxWidgets-3.1.0/include/wx/window.h \ + C:/wxWidgets-3.1.0/include/wx/event.h \ + C:/wxWidgets-3.1.0/include/wx/clntdata.h \ + C:/wxWidgets-3.1.0/include/wx/cursor.h \ + C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \ C:/wxWidgets-3.1.0/include/wx/thread.h \ C:/wxWidgets-3.1.0/include/wx/tracker.h \ C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \ C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \ - C:/wxWidgets-3.1.0/include/wx/region.h \ - C:/wxWidgets-3.1.0/include/wx/msw/region.h \ C:/wxWidgets-3.1.0/include/wx/validate.h \ C:/wxWidgets-3.1.0/include/wx/accel.h \ C:/wxWidgets-3.1.0/include/wx/msw/accel.h \ C:/wxWidgets-3.1.0/include/wx/msw/window.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \ - C:/wxWidgets-3.1.0/include/wx/frame.h \ - C:/wxWidgets-3.1.0/include/wx/toplevel.h \ - C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \ + C:/wxWidgets-3.1.0/include/wx/settings.h \ C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \ + C:/wxWidgets-3.1.0/include/wx/iconbndl.h \ + C:/wxWidgets-3.1.0/include/wx/icon.h \ + C:/wxWidgets-3.1.0/include/wx/iconloc.h \ + C:/wxWidgets-3.1.0/include/wx/msw/icon.h \ C:/wxWidgets-3.1.0/include/wx/weakref.h \ C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \ C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \ - C:/wxWidgets-3.1.0/include/wx/statusbr.h \ - C:/wxWidgets-3.1.0/include/wx/control.h \ - C:/wxWidgets-3.1.0/include/wx/msw/control.h \ - C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h \ - C:/wxWidgets-3.1.0/include/wx/tooltip.h \ - C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \ - C:/wxWidgets-3.1.0/include/wx/msw/frame.h \ - C:/wxWidgets-3.1.0/include/wx/sizer.h \ - C:/wxWidgets-3.1.0/include/wx/panel.h \ C:/wxWidgets-3.1.0/include/wx/containr.h \ + C:/wxWidgets-3.1.0/include/wx/sharedptr.h \ + C:/wxWidgets-3.1.0/include/wx/atomic.h \ + C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h \ + C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \ + C:/wxWidgets-3.1.0/include/wx/panel.h \ C:/wxWidgets-3.1.0/include/wx/msw/panel.h \ - C:/wxWidgets-3.1.0/include/wx/menu.h \ - C:/wxWidgets-3.1.0/include/wx/menuitem.h \ - C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \ - C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \ - C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \ - C:/wxWidgets-3.1.0/include/wx/msw/menu.h \ - C:/wxWidgets-3.1.0/include/wx/toolbar.h \ - C:/wxWidgets-3.1.0/include/wx/tbarbase.h \ - C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h - -wxcrafter.h: + C:/wxWidgets-3.1.0/include/wx/stockitem.h \ + C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \ + C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h WorkspaceBase.h \ + C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ + C:/wxWidgets-3.1.0/include/wx/filesys.h \ + C:/wxWidgets-3.1.0/include/wx/filename.h \ + C:/wxWidgets-3.1.0/include/wx/file.h \ + C:/wxWidgets-3.1.0/include/wx/convauto.h \ + C:/wxWidgets-3.1.0/include/wx/artprov.h \ + C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \ + C:/wxWidgets-3.1.0/include/wx/imaglist.h \ + C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \ + C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \ + C:/wxWidgets-3.1.0/include/wx/sizer.h \ + C:/wxWidgets-3.1.0/include/wx/glcanvas.h \ + C:/wxWidgets-3.1.0/include/wx/app.h \ + C:/wxWidgets-3.1.0/include/wx/eventfilter.h \ + C:/wxWidgets-3.1.0/include/wx/build.h \ + C:/wxWidgets-3.1.0/include/wx/cmdargs.h \ + C:/wxWidgets-3.1.0/include/wx/init.h \ + C:/wxWidgets-3.1.0/include/wx/msw/init.h \ + C:/wxWidgets-3.1.0/include/wx/log.h \ + C:/wxWidgets-3.1.0/include/wx/generic/logg.h \ + C:/wxWidgets-3.1.0/include/wx/msw/app.h \ + C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h \ + C:/wxWidgets-3.1.0/include/wx/persist.h \ + C:/wxWidgets-3.1.0/include/wx/confbase.h \ + C:/wxWidgets-3.1.0/include/wx/base64.h \ + C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \ + C:/wxWidgets-3.1.0/include/wx/persist/window.h \ + C:/wxWidgets-3.1.0/include/wx/display.h \ + C:/wxWidgets-3.1.0/include/wx/vidmode.h \ + C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \ + C:/wxWidgets-3.1.0/include/wx/bookctrl.h \ + C:/wxWidgets-3.1.0/include/wx/control.h \ + C:/wxWidgets-3.1.0/include/wx/msw/control.h \ + C:/wxWidgets-3.1.0/include/wx/withimages.h \ + C:/wxWidgets-3.1.0/include/wx/notebook.h \ + C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \ + C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \ + C:/wxWidgets-3.1.0/include/wx/treebook.h \ + C:/wxWidgets-3.1.0/include/wx/treectrl.h \ + C:/wxWidgets-3.1.0/include/wx/treebase.h \ + C:/wxWidgets-3.1.0/include/wx/itemid.h \ + C:/wxWidgets-3.1.0/include/wx/textctrl.h \ + C:/wxWidgets-3.1.0/include/wx/textentry.h \ + C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \ + C:/wxWidgets-3.1.0/include/wx/ioswrap.h \ + C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \ + C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \ + C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h Element.h + +MouseEventsHandler.h: + +Workspace.h: + +C:/wxWidgets-3.1.0/include/wx/dcclient.h: + +C:/wxWidgets-3.1.0/include/wx/dc.h: -C:/wxWidgets-3.1.0/include/wx/settings.h: +C:/wxWidgets-3.1.0/include/wx/object.h: -C:/wxWidgets-3.1.0/include/wx/colour.h: +C:/wxWidgets-3.1.0/include/wx/memory.h: C:/wxWidgets-3.1.0/include/wx/defs.h: @@ -182,12 +227,6 @@ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h: C:/wxWidgets-3.1.0/include/wx/features.h: -C:/wxWidgets-3.1.0/include/wx/gdiobj.h: - -C:/wxWidgets-3.1.0/include/wx/object.h: - -C:/wxWidgets-3.1.0/include/wx/memory.h: - C:/wxWidgets-3.1.0/include/wx/string.h: C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h: @@ -222,6 +261,24 @@ C:/wxWidgets-3.1.0/include/wx/flags.h: C:/wxWidgets-3.1.0/include/wx/xti2.h: +C:/wxWidgets-3.1.0/include/wx/intl.h: + +C:/wxWidgets-3.1.0/include/wx/translation.h: + +C:/wxWidgets-3.1.0/include/wx/language.h: + +C:/wxWidgets-3.1.0/include/wx/hashmap.h: + +C:/wxWidgets-3.1.0/include/wx/wxcrt.h: + +C:/wxWidgets-3.1.0/include/wx/scopedptr.h: + +C:/wxWidgets-3.1.0/include/wx/checkeddelete.h: + +C:/wxWidgets-3.1.0/include/wx/colour.h: + +C:/wxWidgets-3.1.0/include/wx/gdiobj.h: + C:/wxWidgets-3.1.0/include/wx/variant.h: C:/wxWidgets-3.1.0/include/wx/arrstr.h: @@ -258,42 +315,18 @@ C:/wxWidgets-3.1.0/include/wx/font.h: C:/wxWidgets-3.1.0/include/wx/gdicmn.h: -C:/wxWidgets-3.1.0/include/wx/hashmap.h: - -C:/wxWidgets-3.1.0/include/wx/wxcrt.h: - C:/wxWidgets-3.1.0/include/wx/math.h: C:/wxWidgets-3.1.0/include/wx/msw/font.h: -C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: +C:/wxWidgets-3.1.0/include/wx/bitmap.h: -C:/wxWidgets-3.1.0/include/wx/filesys.h: +C:/wxWidgets-3.1.0/include/wx/image.h: C:/wxWidgets-3.1.0/include/wx/stream.h: C:/wxWidgets-3.1.0/include/wx/filefn.h: -C:/wxWidgets-3.1.0/include/wx/filename.h: - -C:/wxWidgets-3.1.0/include/wx/intl.h: - -C:/wxWidgets-3.1.0/include/wx/translation.h: - -C:/wxWidgets-3.1.0/include/wx/language.h: - -C:/wxWidgets-3.1.0/include/wx/scopedptr.h: - -C:/wxWidgets-3.1.0/include/wx/checkeddelete.h: - -C:/wxWidgets-3.1.0/include/wx/file.h: - -C:/wxWidgets-3.1.0/include/wx/convauto.h: - -C:/wxWidgets-3.1.0/include/wx/bitmap.h: - -C:/wxWidgets-3.1.0/include/wx/image.h: - C:/wxWidgets-3.1.0/include/wx/imagbmp.h: C:/wxWidgets-3.1.0/include/wx/imagpng.h: @@ -324,31 +357,23 @@ C:/wxWidgets-3.1.0/include/wx/palette.h: C:/wxWidgets-3.1.0/include/wx/msw/palette.h: -C:/wxWidgets-3.1.0/include/wx/icon.h: +C:/wxWidgets-3.1.0/include/wx/brush.h: -C:/wxWidgets-3.1.0/include/wx/iconloc.h: +C:/wxWidgets-3.1.0/include/wx/msw/brush.h: -C:/wxWidgets-3.1.0/include/wx/msw/icon.h: - -C:/wxWidgets-3.1.0/include/wx/artprov.h: - -C:/wxWidgets-3.1.0/include/wx/iconbndl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h: +C:/wxWidgets-3.1.0/include/wx/pen.h: -C:/wxWidgets-3.1.0/include/wx/imaglist.h: +C:/wxWidgets-3.1.0/include/wx/msw/pen.h: -C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h: - -C:/wxWidgets-3.1.0/include/wx/window.h: +C:/wxWidgets-3.1.0/include/wx/region.h: -C:/wxWidgets-3.1.0/include/wx/event.h: +C:/wxWidgets-3.1.0/include/wx/msw/region.h: -C:/wxWidgets-3.1.0/include/wx/clntdata.h: +C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h: -C:/wxWidgets-3.1.0/include/wx/cursor.h: +C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h: -C:/wxWidgets-3.1.0/include/wx/msw/cursor.h: +C:/wxWidgets-3.1.0/include/wx/geometry.h: C:/wxWidgets-3.1.0/include/wx/utils.h: @@ -360,6 +385,24 @@ C:/wxWidgets-3.1.0/include/wx/kbdstate.h: C:/wxWidgets-3.1.0/include/wx/platinfo.h: +C:/wxWidgets-3.1.0/include/wx/msgdlg.h: + +C:/wxWidgets-3.1.0/include/wx/dialog.h: + +C:/wxWidgets-3.1.0/include/wx/toplevel.h: + +C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h: + +C:/wxWidgets-3.1.0/include/wx/window.h: + +C:/wxWidgets-3.1.0/include/wx/event.h: + +C:/wxWidgets-3.1.0/include/wx/clntdata.h: + +C:/wxWidgets-3.1.0/include/wx/cursor.h: + +C:/wxWidgets-3.1.0/include/wx/msw/cursor.h: + C:/wxWidgets-3.1.0/include/wx/thread.h: C:/wxWidgets-3.1.0/include/wx/tracker.h: @@ -368,10 +411,6 @@ C:/wxWidgets-3.1.0/include/wx/meta/convertible.h: C:/wxWidgets-3.1.0/include/wx/meta/removeref.h: -C:/wxWidgets-3.1.0/include/wx/region.h: - -C:/wxWidgets-3.1.0/include/wx/msw/region.h: - C:/wxWidgets-3.1.0/include/wx/validate.h: C:/wxWidgets-3.1.0/include/wx/accel.h: @@ -380,15 +419,17 @@ C:/wxWidgets-3.1.0/include/wx/msw/accel.h: C:/wxWidgets-3.1.0/include/wx/msw/window.h: -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h: +C:/wxWidgets-3.1.0/include/wx/settings.h: -C:/wxWidgets-3.1.0/include/wx/frame.h: +C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h: -C:/wxWidgets-3.1.0/include/wx/toplevel.h: +C:/wxWidgets-3.1.0/include/wx/iconbndl.h: -C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h: +C:/wxWidgets-3.1.0/include/wx/icon.h: -C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h: +C:/wxWidgets-3.1.0/include/wx/iconloc.h: + +C:/wxWidgets-3.1.0/include/wx/msw/icon.h: C:/wxWidgets-3.1.0/include/wx/weakref.h: @@ -396,42 +437,124 @@ C:/wxWidgets-3.1.0/include/wx/meta/int2type.h: C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h: -C:/wxWidgets-3.1.0/include/wx/statusbr.h: +C:/wxWidgets-3.1.0/include/wx/containr.h: + +C:/wxWidgets-3.1.0/include/wx/sharedptr.h: + +C:/wxWidgets-3.1.0/include/wx/atomic.h: + +C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h: + +C:/wxWidgets-3.1.0/include/wx/msw/dialog.h: + +C:/wxWidgets-3.1.0/include/wx/panel.h: + +C:/wxWidgets-3.1.0/include/wx/msw/panel.h: + +C:/wxWidgets-3.1.0/include/wx/stockitem.h: + +C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h: + +C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h: + +WorkspaceBase.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: + +C:/wxWidgets-3.1.0/include/wx/filesys.h: + +C:/wxWidgets-3.1.0/include/wx/filename.h: + +C:/wxWidgets-3.1.0/include/wx/file.h: + +C:/wxWidgets-3.1.0/include/wx/convauto.h: + +C:/wxWidgets-3.1.0/include/wx/artprov.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h: + +C:/wxWidgets-3.1.0/include/wx/imaglist.h: + +C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h: + +C:/wxWidgets-3.1.0/include/wx/sizer.h: + +C:/wxWidgets-3.1.0/include/wx/glcanvas.h: + +C:/wxWidgets-3.1.0/include/wx/app.h: + +C:/wxWidgets-3.1.0/include/wx/eventfilter.h: + +C:/wxWidgets-3.1.0/include/wx/build.h: + +C:/wxWidgets-3.1.0/include/wx/cmdargs.h: + +C:/wxWidgets-3.1.0/include/wx/init.h: + +C:/wxWidgets-3.1.0/include/wx/msw/init.h: + +C:/wxWidgets-3.1.0/include/wx/log.h: + +C:/wxWidgets-3.1.0/include/wx/generic/logg.h: + +C:/wxWidgets-3.1.0/include/wx/msw/app.h: + +C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h: + +C:/wxWidgets-3.1.0/include/wx/persist.h: + +C:/wxWidgets-3.1.0/include/wx/confbase.h: + +C:/wxWidgets-3.1.0/include/wx/base64.h: + +C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h: + +C:/wxWidgets-3.1.0/include/wx/persist/window.h: + +C:/wxWidgets-3.1.0/include/wx/display.h: + +C:/wxWidgets-3.1.0/include/wx/vidmode.h: + +C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h: + +C:/wxWidgets-3.1.0/include/wx/bookctrl.h: C:/wxWidgets-3.1.0/include/wx/control.h: C:/wxWidgets-3.1.0/include/wx/msw/control.h: -C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h: +C:/wxWidgets-3.1.0/include/wx/withimages.h: -C:/wxWidgets-3.1.0/include/wx/tooltip.h: +C:/wxWidgets-3.1.0/include/wx/notebook.h: -C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h: +C:/wxWidgets-3.1.0/include/wx/msw/notebook.h: -C:/wxWidgets-3.1.0/include/wx/msw/frame.h: +C:/wxWidgets-3.1.0/include/wx/persist/treebook.h: -C:/wxWidgets-3.1.0/include/wx/sizer.h: +C:/wxWidgets-3.1.0/include/wx/treebook.h: -C:/wxWidgets-3.1.0/include/wx/panel.h: +C:/wxWidgets-3.1.0/include/wx/treectrl.h: -C:/wxWidgets-3.1.0/include/wx/containr.h: +C:/wxWidgets-3.1.0/include/wx/treebase.h: -C:/wxWidgets-3.1.0/include/wx/msw/panel.h: +C:/wxWidgets-3.1.0/include/wx/itemid.h: -C:/wxWidgets-3.1.0/include/wx/menu.h: +C:/wxWidgets-3.1.0/include/wx/textctrl.h: -C:/wxWidgets-3.1.0/include/wx/menuitem.h: +C:/wxWidgets-3.1.0/include/wx/textentry.h: -C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h: +C:/wxWidgets-3.1.0/include/wx/msw/textentry.h: -C:/wxWidgets-3.1.0/include/wx/ownerdrw.h: +C:/wxWidgets-3.1.0/include/wx/ioswrap.h: -C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h: +C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h: -C:/wxWidgets-3.1.0/include/wx/msw/menu.h: +C:/wxWidgets-3.1.0/include/wx/systhemectrl.h: -C:/wxWidgets-3.1.0/include/wx/toolbar.h: +C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h: -C:/wxWidgets-3.1.0/include/wx/tbarbase.h: +Bus.h: -C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h: +Element.h: diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe Binary files differindex 259f65f..3055ff0 100644 --- a/Project/Release/PSP-UFU.exe +++ b/Project/Release/PSP-UFU.exe diff --git a/Project/Release/Workspace.cpp.o b/Project/Release/Workspace.cpp.o Binary files differindex bb040d3..fc530f0 100644 --- a/Project/Release/Workspace.cpp.o +++ b/Project/Release/Workspace.cpp.o diff --git a/Project/Release/Workspace.cpp.o.d b/Project/Release/Workspace.cpp.o.d index 9dc33dd..46f6f75 100644 --- a/Project/Release/Workspace.cpp.o.d +++ b/Project/Release/Workspace.cpp.o.d @@ -180,7 +180,8 @@ Release/Workspace.cpp.o: Workspace.cpp Workspace.h \ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \ - C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h Element.h + C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h Element.h \ + MouseEventsHandler.h Workspace.h: @@ -555,3 +556,5 @@ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h: Bus.h: Element.h: + +MouseEventsHandler.h: diff --git a/Project/Release/WorkspaceBase.cpp.o b/Project/Release/WorkspaceBase.cpp.o Binary files differindex e4f8b6a..8265343 100644 --- a/Project/Release/WorkspaceBase.cpp.o +++ b/Project/Release/WorkspaceBase.cpp.o diff --git a/Project/Release/Workspace_project_bitmaps.cpp.o b/Project/Release/Workspace_project_bitmaps.cpp.o Binary files differdeleted file mode 100644 index a6c3124..0000000 --- a/Project/Release/Workspace_project_bitmaps.cpp.o +++ /dev/null diff --git a/Project/Release/Workspace_project_bitmaps.cpp.o.d b/Project/Release/Workspace_project_bitmaps.cpp.o.d deleted file mode 100644 index 3d989c1..0000000 --- a/Project/Release/Workspace_project_bitmaps.cpp.o.d +++ /dev/null @@ -1,558 +0,0 @@ -Release/Workspace_project_bitmaps.cpp.o: Workspace_project_bitmaps.cpp \ - C:/wxWidgets-3.1.0/include/wx/wxprec.h \ - C:/wxWidgets-3.1.0/include/wx/defs.h \ - C:/wxWidgets-3.1.0/include/wx/platform.h \ - C:/wxWidgets-3.1.0/include/wx/compiler.h \ - C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h \ - C:/wxWidgets-3.1.0/include/wx/msw/libraries.h \ - C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h \ - C:/wxWidgets-3.1.0/include/wx/chkconf.h \ - C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h \ - C:/wxWidgets-3.1.0/include/wx/version.h \ - C:/wxWidgets-3.1.0/include/wx/cpp.h \ - C:/wxWidgets-3.1.0/include/wx/dlimpexp.h \ - C:/wxWidgets-3.1.0/include/wx/debug.h \ - C:/wxWidgets-3.1.0/include/wx/chartype.h \ - C:/wxWidgets-3.1.0/include/wx/windowid.h \ - C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \ - C:/wxWidgets-3.1.0/include/wx/features.h \ - C:/wxWidgets-3.1.0/include/wx/filesys.h \ - C:/wxWidgets-3.1.0/include/wx/stream.h \ - C:/wxWidgets-3.1.0/include/wx/object.h \ - C:/wxWidgets-3.1.0/include/wx/memory.h \ - C:/wxWidgets-3.1.0/include/wx/string.h \ - C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h \ - C:/wxWidgets-3.1.0/include/wx/strvararg.h \ - C:/wxWidgets-3.1.0/include/wx/strconv.h \ - C:/wxWidgets-3.1.0/include/wx/buffer.h \ - C:/wxWidgets-3.1.0/include/wx/fontenc.h \ - C:/wxWidgets-3.1.0/include/wx/unichar.h \ - C:/wxWidgets-3.1.0/include/wx/stringimpl.h \ - C:/wxWidgets-3.1.0/include/wx/beforestd.h \ - C:/wxWidgets-3.1.0/include/wx/afterstd.h \ - C:/wxWidgets-3.1.0/include/wx/stringops.h \ - C:/wxWidgets-3.1.0/include/wx/iosfwrap.h \ - C:/wxWidgets-3.1.0/include/wx/msgout.h \ - C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \ - C:/wxWidgets-3.1.0/include/wx/flags.h \ - C:/wxWidgets-3.1.0/include/wx/xti2.h \ - C:/wxWidgets-3.1.0/include/wx/filefn.h \ - C:/wxWidgets-3.1.0/include/wx/list.h \ - C:/wxWidgets-3.1.0/include/wx/vector.h \ - C:/wxWidgets-3.1.0/include/wx/scopeguard.h \ - C:/wxWidgets-3.1.0/include/wx/except.h \ - C:/wxWidgets-3.1.0/include/wx/meta/movable.h \ - C:/wxWidgets-3.1.0/include/wx/meta/pod.h \ - C:/wxWidgets-3.1.0/include/wx/meta/if.h \ - C:/wxWidgets-3.1.0/include/wx/arrstr.h \ - C:/wxWidgets-3.1.0/include/wx/datetime.h \ - C:/wxWidgets-3.1.0/include/wx/longlong.h \ - C:/wxWidgets-3.1.0/include/wx/anystr.h \ - C:/wxWidgets-3.1.0/include/wx/dynarray.h \ - C:/wxWidgets-3.1.0/include/wx/filename.h \ - C:/wxWidgets-3.1.0/include/wx/intl.h \ - C:/wxWidgets-3.1.0/include/wx/translation.h \ - C:/wxWidgets-3.1.0/include/wx/language.h \ - C:/wxWidgets-3.1.0/include/wx/hashmap.h \ - C:/wxWidgets-3.1.0/include/wx/wxcrt.h \ - C:/wxWidgets-3.1.0/include/wx/scopedptr.h \ - C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \ - C:/wxWidgets-3.1.0/include/wx/file.h \ - C:/wxWidgets-3.1.0/include/wx/convauto.h \ - C:/wxWidgets-3.1.0/include/wx/fs_mem.h \ - C:/wxWidgets-3.1.0/include/wx/bitmap.h \ - C:/wxWidgets-3.1.0/include/wx/gdicmn.h \ - C:/wxWidgets-3.1.0/include/wx/math.h \ - C:/wxWidgets-3.1.0/include/wx/colour.h \ - C:/wxWidgets-3.1.0/include/wx/gdiobj.h \ - C:/wxWidgets-3.1.0/include/wx/variant.h \ - C:/wxWidgets-3.1.0/include/wx/any.h \ - C:/wxWidgets-3.1.0/include/wx/typeinfo.h \ - C:/wxWidgets-3.1.0/include/wx/msw/colour.h \ - C:/wxWidgets-3.1.0/include/wx/image.h \ - C:/wxWidgets-3.1.0/include/wx/imagbmp.h \ - C:/wxWidgets-3.1.0/include/wx/imagpng.h \ - C:/wxWidgets-3.1.0/include/wx/versioninfo.h \ - C:/wxWidgets-3.1.0/include/wx/imaggif.h \ - C:/wxWidgets-3.1.0/include/wx/imagpcx.h \ - C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \ - C:/wxWidgets-3.1.0/include/wx/imagtga.h \ - C:/wxWidgets-3.1.0/include/wx/imagtiff.h \ - C:/wxWidgets-3.1.0/include/wx/imagpnm.h \ - C:/wxWidgets-3.1.0/include/wx/imagxpm.h \ - C:/wxWidgets-3.1.0/include/wx/imagiff.h \ - C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \ - C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \ - C:/wxWidgets-3.1.0/include/wx/palette.h \ - C:/wxWidgets-3.1.0/include/wx/msw/palette.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ - C:/wxWidgets-3.1.0/include/wx/icon.h \ - C:/wxWidgets-3.1.0/include/wx/iconloc.h \ - C:/wxWidgets-3.1.0/include/wx/msw/icon.h \ - C:/wxWidgets-3.1.0/include/wx/artprov.h \ - C:/wxWidgets-3.1.0/include/wx/iconbndl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \ - C:/wxWidgets-3.1.0/include/wx/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/window.h \ - C:/wxWidgets-3.1.0/include/wx/event.h \ - C:/wxWidgets-3.1.0/include/wx/clntdata.h \ - C:/wxWidgets-3.1.0/include/wx/cursor.h \ - C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \ - C:/wxWidgets-3.1.0/include/wx/utils.h \ - C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \ - C:/wxWidgets-3.1.0/include/wx/mousestate.h \ - C:/wxWidgets-3.1.0/include/wx/kbdstate.h \ - C:/wxWidgets-3.1.0/include/wx/platinfo.h \ - C:/wxWidgets-3.1.0/include/wx/thread.h \ - C:/wxWidgets-3.1.0/include/wx/tracker.h \ - C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \ - C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \ - C:/wxWidgets-3.1.0/include/wx/font.h \ - C:/wxWidgets-3.1.0/include/wx/msw/font.h \ - C:/wxWidgets-3.1.0/include/wx/region.h \ - C:/wxWidgets-3.1.0/include/wx/msw/region.h \ - C:/wxWidgets-3.1.0/include/wx/validate.h \ - C:/wxWidgets-3.1.0/include/wx/accel.h \ - C:/wxWidgets-3.1.0/include/wx/msw/accel.h \ - C:/wxWidgets-3.1.0/include/wx/msw/window.h \ - C:/wxWidgets-3.1.0/include/wx/settings.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_all.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_activityindicator.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_animatctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bannerwindow.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpbt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpcbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bttn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_cald.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_choic.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_choicbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_clrpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_cmdlinkbn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_collpane.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_combo.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_comboctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_datectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_dirpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_dlg.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_editlbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_filectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_filepicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_fontpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_frame.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_gauge.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_gdctl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_grid.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_html.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_htmllbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_hyperlink.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listc.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_mdi.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_menu.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_notbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_odcombo.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_panel.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_propdlg.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbx.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_scrol.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_scwin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_simplebook.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_sizer.h \ - C:/wxWidgets-3.1.0/include/wx/sizer.h \ - C:/wxWidgets-3.1.0/include/wx/gbsizer.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_slidr.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_spin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_split.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_srchctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_statbar.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbmp.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_sttxt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stlin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_text.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_tglbtn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_timectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_tree.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_treebk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_unkwn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_wizrd.h - -C:/wxWidgets-3.1.0/include/wx/wxprec.h: - -C:/wxWidgets-3.1.0/include/wx/defs.h: - -C:/wxWidgets-3.1.0/include/wx/platform.h: - -C:/wxWidgets-3.1.0/include/wx/compiler.h: - -C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h: - -C:/wxWidgets-3.1.0/include/wx/msw/libraries.h: - -C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h: - -C:/wxWidgets-3.1.0/include/wx/chkconf.h: - -C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h: - -C:/wxWidgets-3.1.0/include/wx/version.h: - -C:/wxWidgets-3.1.0/include/wx/cpp.h: - -C:/wxWidgets-3.1.0/include/wx/dlimpexp.h: - -C:/wxWidgets-3.1.0/include/wx/debug.h: - -C:/wxWidgets-3.1.0/include/wx/chartype.h: - -C:/wxWidgets-3.1.0/include/wx/windowid.h: - -C:/wxWidgets-3.1.0/include/wx/msw/winundef.h: - -C:/wxWidgets-3.1.0/include/wx/features.h: - -C:/wxWidgets-3.1.0/include/wx/filesys.h: - -C:/wxWidgets-3.1.0/include/wx/stream.h: - -C:/wxWidgets-3.1.0/include/wx/object.h: - -C:/wxWidgets-3.1.0/include/wx/memory.h: - -C:/wxWidgets-3.1.0/include/wx/string.h: - -C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h: - -C:/wxWidgets-3.1.0/include/wx/strvararg.h: - -C:/wxWidgets-3.1.0/include/wx/strconv.h: - -C:/wxWidgets-3.1.0/include/wx/buffer.h: - -C:/wxWidgets-3.1.0/include/wx/fontenc.h: - -C:/wxWidgets-3.1.0/include/wx/unichar.h: - -C:/wxWidgets-3.1.0/include/wx/stringimpl.h: - -C:/wxWidgets-3.1.0/include/wx/beforestd.h: - -C:/wxWidgets-3.1.0/include/wx/afterstd.h: - -C:/wxWidgets-3.1.0/include/wx/stringops.h: - -C:/wxWidgets-3.1.0/include/wx/iosfwrap.h: - -C:/wxWidgets-3.1.0/include/wx/msgout.h: - -C:/wxWidgets-3.1.0/include/wx/xti.h: - -C:/wxWidgets-3.1.0/include/wx/rtti.h: - -C:/wxWidgets-3.1.0/include/wx/flags.h: - -C:/wxWidgets-3.1.0/include/wx/xti2.h: - -C:/wxWidgets-3.1.0/include/wx/filefn.h: - -C:/wxWidgets-3.1.0/include/wx/list.h: - -C:/wxWidgets-3.1.0/include/wx/vector.h: - -C:/wxWidgets-3.1.0/include/wx/scopeguard.h: - -C:/wxWidgets-3.1.0/include/wx/except.h: - -C:/wxWidgets-3.1.0/include/wx/meta/movable.h: - -C:/wxWidgets-3.1.0/include/wx/meta/pod.h: - -C:/wxWidgets-3.1.0/include/wx/meta/if.h: - -C:/wxWidgets-3.1.0/include/wx/arrstr.h: - -C:/wxWidgets-3.1.0/include/wx/datetime.h: - -C:/wxWidgets-3.1.0/include/wx/longlong.h: - -C:/wxWidgets-3.1.0/include/wx/anystr.h: - -C:/wxWidgets-3.1.0/include/wx/dynarray.h: - -C:/wxWidgets-3.1.0/include/wx/filename.h: - -C:/wxWidgets-3.1.0/include/wx/intl.h: - -C:/wxWidgets-3.1.0/include/wx/translation.h: - -C:/wxWidgets-3.1.0/include/wx/language.h: - -C:/wxWidgets-3.1.0/include/wx/hashmap.h: - -C:/wxWidgets-3.1.0/include/wx/wxcrt.h: - -C:/wxWidgets-3.1.0/include/wx/scopedptr.h: - -C:/wxWidgets-3.1.0/include/wx/checkeddelete.h: - -C:/wxWidgets-3.1.0/include/wx/file.h: - -C:/wxWidgets-3.1.0/include/wx/convauto.h: - -C:/wxWidgets-3.1.0/include/wx/fs_mem.h: - -C:/wxWidgets-3.1.0/include/wx/bitmap.h: - -C:/wxWidgets-3.1.0/include/wx/gdicmn.h: - -C:/wxWidgets-3.1.0/include/wx/math.h: - -C:/wxWidgets-3.1.0/include/wx/colour.h: - -C:/wxWidgets-3.1.0/include/wx/gdiobj.h: - -C:/wxWidgets-3.1.0/include/wx/variant.h: - -C:/wxWidgets-3.1.0/include/wx/any.h: - -C:/wxWidgets-3.1.0/include/wx/typeinfo.h: - -C:/wxWidgets-3.1.0/include/wx/msw/colour.h: - -C:/wxWidgets-3.1.0/include/wx/image.h: - -C:/wxWidgets-3.1.0/include/wx/imagbmp.h: - -C:/wxWidgets-3.1.0/include/wx/imagpng.h: - -C:/wxWidgets-3.1.0/include/wx/versioninfo.h: - -C:/wxWidgets-3.1.0/include/wx/imaggif.h: - -C:/wxWidgets-3.1.0/include/wx/imagpcx.h: - -C:/wxWidgets-3.1.0/include/wx/imagjpeg.h: - -C:/wxWidgets-3.1.0/include/wx/imagtga.h: - -C:/wxWidgets-3.1.0/include/wx/imagtiff.h: - -C:/wxWidgets-3.1.0/include/wx/imagpnm.h: - -C:/wxWidgets-3.1.0/include/wx/imagxpm.h: - -C:/wxWidgets-3.1.0/include/wx/imagiff.h: - -C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h: - -C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h: - -C:/wxWidgets-3.1.0/include/wx/palette.h: - -C:/wxWidgets-3.1.0/include/wx/msw/palette.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: - -C:/wxWidgets-3.1.0/include/wx/icon.h: - -C:/wxWidgets-3.1.0/include/wx/iconloc.h: - -C:/wxWidgets-3.1.0/include/wx/msw/icon.h: - -C:/wxWidgets-3.1.0/include/wx/artprov.h: - -C:/wxWidgets-3.1.0/include/wx/iconbndl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h: - -C:/wxWidgets-3.1.0/include/wx/imaglist.h: - -C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h: - -C:/wxWidgets-3.1.0/include/wx/window.h: - -C:/wxWidgets-3.1.0/include/wx/event.h: - -C:/wxWidgets-3.1.0/include/wx/clntdata.h: - -C:/wxWidgets-3.1.0/include/wx/cursor.h: - -C:/wxWidgets-3.1.0/include/wx/msw/cursor.h: - -C:/wxWidgets-3.1.0/include/wx/utils.h: - -C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h: - -C:/wxWidgets-3.1.0/include/wx/mousestate.h: - -C:/wxWidgets-3.1.0/include/wx/kbdstate.h: - -C:/wxWidgets-3.1.0/include/wx/platinfo.h: - -C:/wxWidgets-3.1.0/include/wx/thread.h: - -C:/wxWidgets-3.1.0/include/wx/tracker.h: - -C:/wxWidgets-3.1.0/include/wx/meta/convertible.h: - -C:/wxWidgets-3.1.0/include/wx/meta/removeref.h: - -C:/wxWidgets-3.1.0/include/wx/font.h: - -C:/wxWidgets-3.1.0/include/wx/msw/font.h: - -C:/wxWidgets-3.1.0/include/wx/region.h: - -C:/wxWidgets-3.1.0/include/wx/msw/region.h: - -C:/wxWidgets-3.1.0/include/wx/validate.h: - -C:/wxWidgets-3.1.0/include/wx/accel.h: - -C:/wxWidgets-3.1.0/include/wx/msw/accel.h: - -C:/wxWidgets-3.1.0/include/wx/msw/window.h: - -C:/wxWidgets-3.1.0/include/wx/settings.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_all.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_activityindicator.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_animatctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bannerwindow.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpbt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpcbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bttn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_cald.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_choic.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_choicbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_clrpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_cmdlinkbn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_collpane.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_combo.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_comboctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_datectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_dirpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_dlg.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_editlbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_filectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_filepicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_fontpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_frame.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_gauge.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_gdctl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_grid.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_html.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_htmllbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_hyperlink.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listc.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_mdi.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_menu.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_notbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_odcombo.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_panel.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_propdlg.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbx.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_scrol.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_scwin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_simplebook.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_sizer.h: - -C:/wxWidgets-3.1.0/include/wx/sizer.h: - -C:/wxWidgets-3.1.0/include/wx/gbsizer.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_slidr.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_spin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_split.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_srchctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_statbar.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbmp.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_sttxt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stlin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_text.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_tglbtn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_timectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_tree.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_treebk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_unkwn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_wizrd.h: diff --git a/Project/Release/main.cpp.o.d b/Project/Release/main.cpp.o.d index c3e2d04..7b3279f 100644 --- a/Project/Release/main.cpp.o.d +++ b/Project/Release/main.cpp.o.d @@ -199,7 +199,14 @@ Release/main.cpp.o: main.cpp C:/wxWidgets-3.1.0/include/wx/app.h \ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \ - C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h ArtMetro.h + C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h ArtMetro.h Workspace.h \ + C:/wxWidgets-3.1.0/include/wx/dcclient.h \ + C:/wxWidgets-3.1.0/include/wx/dc.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \ + C:/wxWidgets-3.1.0/include/wx/geometry.h WorkspaceBase.h \ + C:/wxWidgets-3.1.0/include/wx/glcanvas.h \ + C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h Bus.h Element.h C:/wxWidgets-3.1.0/include/wx/app.h: @@ -612,3 +619,25 @@ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h: C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h: ArtMetro.h: + +Workspace.h: + +C:/wxWidgets-3.1.0/include/wx/dcclient.h: + +C:/wxWidgets-3.1.0/include/wx/dc.h: + +C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h: + +C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h: + +C:/wxWidgets-3.1.0/include/wx/geometry.h: + +WorkspaceBase.h: + +C:/wxWidgets-3.1.0/include/wx/glcanvas.h: + +C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h: + +Bus.h: + +Element.h: diff --git a/Project/Release/wxcrafter.cpp.o b/Project/Release/wxcrafter.cpp.o Binary files differdeleted file mode 100644 index f219c8b..0000000 --- a/Project/Release/wxcrafter.cpp.o +++ /dev/null diff --git a/Project/Release/wxcrafter_bitmaps.cpp.o b/Project/Release/wxcrafter_bitmaps.cpp.o Binary files differdeleted file mode 100644 index 9abf0b4..0000000 --- a/Project/Release/wxcrafter_bitmaps.cpp.o +++ /dev/null diff --git a/Project/Release/wxcrafter_bitmaps.cpp.o.d b/Project/Release/wxcrafter_bitmaps.cpp.o.d deleted file mode 100644 index 926ee16..0000000 --- a/Project/Release/wxcrafter_bitmaps.cpp.o.d +++ /dev/null @@ -1,558 +0,0 @@ -Release/wxcrafter_bitmaps.cpp.o: wxcrafter_bitmaps.cpp \ - C:/wxWidgets-3.1.0/include/wx/wxprec.h \ - C:/wxWidgets-3.1.0/include/wx/defs.h \ - C:/wxWidgets-3.1.0/include/wx/platform.h \ - C:/wxWidgets-3.1.0/include/wx/compiler.h \ - C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h \ - C:/wxWidgets-3.1.0/include/wx/msw/libraries.h \ - C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h \ - C:/wxWidgets-3.1.0/include/wx/chkconf.h \ - C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h \ - C:/wxWidgets-3.1.0/include/wx/version.h \ - C:/wxWidgets-3.1.0/include/wx/cpp.h \ - C:/wxWidgets-3.1.0/include/wx/dlimpexp.h \ - C:/wxWidgets-3.1.0/include/wx/debug.h \ - C:/wxWidgets-3.1.0/include/wx/chartype.h \ - C:/wxWidgets-3.1.0/include/wx/windowid.h \ - C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \ - C:/wxWidgets-3.1.0/include/wx/features.h \ - C:/wxWidgets-3.1.0/include/wx/filesys.h \ - C:/wxWidgets-3.1.0/include/wx/stream.h \ - C:/wxWidgets-3.1.0/include/wx/object.h \ - C:/wxWidgets-3.1.0/include/wx/memory.h \ - C:/wxWidgets-3.1.0/include/wx/string.h \ - C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h \ - C:/wxWidgets-3.1.0/include/wx/strvararg.h \ - C:/wxWidgets-3.1.0/include/wx/strconv.h \ - C:/wxWidgets-3.1.0/include/wx/buffer.h \ - C:/wxWidgets-3.1.0/include/wx/fontenc.h \ - C:/wxWidgets-3.1.0/include/wx/unichar.h \ - C:/wxWidgets-3.1.0/include/wx/stringimpl.h \ - C:/wxWidgets-3.1.0/include/wx/beforestd.h \ - C:/wxWidgets-3.1.0/include/wx/afterstd.h \ - C:/wxWidgets-3.1.0/include/wx/stringops.h \ - C:/wxWidgets-3.1.0/include/wx/iosfwrap.h \ - C:/wxWidgets-3.1.0/include/wx/msgout.h \ - C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \ - C:/wxWidgets-3.1.0/include/wx/flags.h \ - C:/wxWidgets-3.1.0/include/wx/xti2.h \ - C:/wxWidgets-3.1.0/include/wx/filefn.h \ - C:/wxWidgets-3.1.0/include/wx/list.h \ - C:/wxWidgets-3.1.0/include/wx/vector.h \ - C:/wxWidgets-3.1.0/include/wx/scopeguard.h \ - C:/wxWidgets-3.1.0/include/wx/except.h \ - C:/wxWidgets-3.1.0/include/wx/meta/movable.h \ - C:/wxWidgets-3.1.0/include/wx/meta/pod.h \ - C:/wxWidgets-3.1.0/include/wx/meta/if.h \ - C:/wxWidgets-3.1.0/include/wx/arrstr.h \ - C:/wxWidgets-3.1.0/include/wx/datetime.h \ - C:/wxWidgets-3.1.0/include/wx/longlong.h \ - C:/wxWidgets-3.1.0/include/wx/anystr.h \ - C:/wxWidgets-3.1.0/include/wx/dynarray.h \ - C:/wxWidgets-3.1.0/include/wx/filename.h \ - C:/wxWidgets-3.1.0/include/wx/intl.h \ - C:/wxWidgets-3.1.0/include/wx/translation.h \ - C:/wxWidgets-3.1.0/include/wx/language.h \ - C:/wxWidgets-3.1.0/include/wx/hashmap.h \ - C:/wxWidgets-3.1.0/include/wx/wxcrt.h \ - C:/wxWidgets-3.1.0/include/wx/scopedptr.h \ - C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \ - C:/wxWidgets-3.1.0/include/wx/file.h \ - C:/wxWidgets-3.1.0/include/wx/convauto.h \ - C:/wxWidgets-3.1.0/include/wx/fs_mem.h \ - C:/wxWidgets-3.1.0/include/wx/bitmap.h \ - C:/wxWidgets-3.1.0/include/wx/gdicmn.h \ - C:/wxWidgets-3.1.0/include/wx/math.h \ - C:/wxWidgets-3.1.0/include/wx/colour.h \ - C:/wxWidgets-3.1.0/include/wx/gdiobj.h \ - C:/wxWidgets-3.1.0/include/wx/variant.h \ - C:/wxWidgets-3.1.0/include/wx/any.h \ - C:/wxWidgets-3.1.0/include/wx/typeinfo.h \ - C:/wxWidgets-3.1.0/include/wx/msw/colour.h \ - C:/wxWidgets-3.1.0/include/wx/image.h \ - C:/wxWidgets-3.1.0/include/wx/imagbmp.h \ - C:/wxWidgets-3.1.0/include/wx/imagpng.h \ - C:/wxWidgets-3.1.0/include/wx/versioninfo.h \ - C:/wxWidgets-3.1.0/include/wx/imaggif.h \ - C:/wxWidgets-3.1.0/include/wx/imagpcx.h \ - C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \ - C:/wxWidgets-3.1.0/include/wx/imagtga.h \ - C:/wxWidgets-3.1.0/include/wx/imagtiff.h \ - C:/wxWidgets-3.1.0/include/wx/imagpnm.h \ - C:/wxWidgets-3.1.0/include/wx/imagxpm.h \ - C:/wxWidgets-3.1.0/include/wx/imagiff.h \ - C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \ - C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \ - C:/wxWidgets-3.1.0/include/wx/palette.h \ - C:/wxWidgets-3.1.0/include/wx/msw/palette.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ - C:/wxWidgets-3.1.0/include/wx/icon.h \ - C:/wxWidgets-3.1.0/include/wx/iconloc.h \ - C:/wxWidgets-3.1.0/include/wx/msw/icon.h \ - C:/wxWidgets-3.1.0/include/wx/artprov.h \ - C:/wxWidgets-3.1.0/include/wx/iconbndl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \ - C:/wxWidgets-3.1.0/include/wx/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \ - C:/wxWidgets-3.1.0/include/wx/window.h \ - C:/wxWidgets-3.1.0/include/wx/event.h \ - C:/wxWidgets-3.1.0/include/wx/clntdata.h \ - C:/wxWidgets-3.1.0/include/wx/cursor.h \ - C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \ - C:/wxWidgets-3.1.0/include/wx/utils.h \ - C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \ - C:/wxWidgets-3.1.0/include/wx/mousestate.h \ - C:/wxWidgets-3.1.0/include/wx/kbdstate.h \ - C:/wxWidgets-3.1.0/include/wx/platinfo.h \ - C:/wxWidgets-3.1.0/include/wx/thread.h \ - C:/wxWidgets-3.1.0/include/wx/tracker.h \ - C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \ - C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \ - C:/wxWidgets-3.1.0/include/wx/font.h \ - C:/wxWidgets-3.1.0/include/wx/msw/font.h \ - C:/wxWidgets-3.1.0/include/wx/region.h \ - C:/wxWidgets-3.1.0/include/wx/msw/region.h \ - C:/wxWidgets-3.1.0/include/wx/validate.h \ - C:/wxWidgets-3.1.0/include/wx/accel.h \ - C:/wxWidgets-3.1.0/include/wx/msw/accel.h \ - C:/wxWidgets-3.1.0/include/wx/msw/window.h \ - C:/wxWidgets-3.1.0/include/wx/settings.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_all.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_activityindicator.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_animatctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bannerwindow.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpbt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpcbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_bttn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_cald.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_choic.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_choicbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_clrpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_cmdlinkbn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_collpane.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_combo.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_comboctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_datectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_dirpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_dlg.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_editlbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_filectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_filepicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_fontpicker.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_frame.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_gauge.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_gdctl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_grid.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_html.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_htmllbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_hyperlink.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listc.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_listbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_mdi.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_menu.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_notbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_odcombo.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_panel.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_propdlg.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbx.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_scrol.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_scwin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_simplebook.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_sizer.h \ - C:/wxWidgets-3.1.0/include/wx/sizer.h \ - C:/wxWidgets-3.1.0/include/wx/gbsizer.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_slidr.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_spin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_split.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_srchctrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_statbar.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbox.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbmp.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_sttxt.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_stlin.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_text.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_tglbtn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_timectrl.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolb.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolbk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_tree.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_treebk.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_unkwn.h \ - C:/wxWidgets-3.1.0/include/wx/xrc/xh_wizrd.h - -C:/wxWidgets-3.1.0/include/wx/wxprec.h: - -C:/wxWidgets-3.1.0/include/wx/defs.h: - -C:/wxWidgets-3.1.0/include/wx/platform.h: - -C:/wxWidgets-3.1.0/include/wx/compiler.h: - -C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h: - -C:/wxWidgets-3.1.0/include/wx/msw/libraries.h: - -C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h: - -C:/wxWidgets-3.1.0/include/wx/chkconf.h: - -C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h: - -C:/wxWidgets-3.1.0/include/wx/version.h: - -C:/wxWidgets-3.1.0/include/wx/cpp.h: - -C:/wxWidgets-3.1.0/include/wx/dlimpexp.h: - -C:/wxWidgets-3.1.0/include/wx/debug.h: - -C:/wxWidgets-3.1.0/include/wx/chartype.h: - -C:/wxWidgets-3.1.0/include/wx/windowid.h: - -C:/wxWidgets-3.1.0/include/wx/msw/winundef.h: - -C:/wxWidgets-3.1.0/include/wx/features.h: - -C:/wxWidgets-3.1.0/include/wx/filesys.h: - -C:/wxWidgets-3.1.0/include/wx/stream.h: - -C:/wxWidgets-3.1.0/include/wx/object.h: - -C:/wxWidgets-3.1.0/include/wx/memory.h: - -C:/wxWidgets-3.1.0/include/wx/string.h: - -C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h: - -C:/wxWidgets-3.1.0/include/wx/strvararg.h: - -C:/wxWidgets-3.1.0/include/wx/strconv.h: - -C:/wxWidgets-3.1.0/include/wx/buffer.h: - -C:/wxWidgets-3.1.0/include/wx/fontenc.h: - -C:/wxWidgets-3.1.0/include/wx/unichar.h: - -C:/wxWidgets-3.1.0/include/wx/stringimpl.h: - -C:/wxWidgets-3.1.0/include/wx/beforestd.h: - -C:/wxWidgets-3.1.0/include/wx/afterstd.h: - -C:/wxWidgets-3.1.0/include/wx/stringops.h: - -C:/wxWidgets-3.1.0/include/wx/iosfwrap.h: - -C:/wxWidgets-3.1.0/include/wx/msgout.h: - -C:/wxWidgets-3.1.0/include/wx/xti.h: - -C:/wxWidgets-3.1.0/include/wx/rtti.h: - -C:/wxWidgets-3.1.0/include/wx/flags.h: - -C:/wxWidgets-3.1.0/include/wx/xti2.h: - -C:/wxWidgets-3.1.0/include/wx/filefn.h: - -C:/wxWidgets-3.1.0/include/wx/list.h: - -C:/wxWidgets-3.1.0/include/wx/vector.h: - -C:/wxWidgets-3.1.0/include/wx/scopeguard.h: - -C:/wxWidgets-3.1.0/include/wx/except.h: - -C:/wxWidgets-3.1.0/include/wx/meta/movable.h: - -C:/wxWidgets-3.1.0/include/wx/meta/pod.h: - -C:/wxWidgets-3.1.0/include/wx/meta/if.h: - -C:/wxWidgets-3.1.0/include/wx/arrstr.h: - -C:/wxWidgets-3.1.0/include/wx/datetime.h: - -C:/wxWidgets-3.1.0/include/wx/longlong.h: - -C:/wxWidgets-3.1.0/include/wx/anystr.h: - -C:/wxWidgets-3.1.0/include/wx/dynarray.h: - -C:/wxWidgets-3.1.0/include/wx/filename.h: - -C:/wxWidgets-3.1.0/include/wx/intl.h: - -C:/wxWidgets-3.1.0/include/wx/translation.h: - -C:/wxWidgets-3.1.0/include/wx/language.h: - -C:/wxWidgets-3.1.0/include/wx/hashmap.h: - -C:/wxWidgets-3.1.0/include/wx/wxcrt.h: - -C:/wxWidgets-3.1.0/include/wx/scopedptr.h: - -C:/wxWidgets-3.1.0/include/wx/checkeddelete.h: - -C:/wxWidgets-3.1.0/include/wx/file.h: - -C:/wxWidgets-3.1.0/include/wx/convauto.h: - -C:/wxWidgets-3.1.0/include/wx/fs_mem.h: - -C:/wxWidgets-3.1.0/include/wx/bitmap.h: - -C:/wxWidgets-3.1.0/include/wx/gdicmn.h: - -C:/wxWidgets-3.1.0/include/wx/math.h: - -C:/wxWidgets-3.1.0/include/wx/colour.h: - -C:/wxWidgets-3.1.0/include/wx/gdiobj.h: - -C:/wxWidgets-3.1.0/include/wx/variant.h: - -C:/wxWidgets-3.1.0/include/wx/any.h: - -C:/wxWidgets-3.1.0/include/wx/typeinfo.h: - -C:/wxWidgets-3.1.0/include/wx/msw/colour.h: - -C:/wxWidgets-3.1.0/include/wx/image.h: - -C:/wxWidgets-3.1.0/include/wx/imagbmp.h: - -C:/wxWidgets-3.1.0/include/wx/imagpng.h: - -C:/wxWidgets-3.1.0/include/wx/versioninfo.h: - -C:/wxWidgets-3.1.0/include/wx/imaggif.h: - -C:/wxWidgets-3.1.0/include/wx/imagpcx.h: - -C:/wxWidgets-3.1.0/include/wx/imagjpeg.h: - -C:/wxWidgets-3.1.0/include/wx/imagtga.h: - -C:/wxWidgets-3.1.0/include/wx/imagtiff.h: - -C:/wxWidgets-3.1.0/include/wx/imagpnm.h: - -C:/wxWidgets-3.1.0/include/wx/imagxpm.h: - -C:/wxWidgets-3.1.0/include/wx/imagiff.h: - -C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h: - -C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h: - -C:/wxWidgets-3.1.0/include/wx/palette.h: - -C:/wxWidgets-3.1.0/include/wx/msw/palette.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: - -C:/wxWidgets-3.1.0/include/wx/icon.h: - -C:/wxWidgets-3.1.0/include/wx/iconloc.h: - -C:/wxWidgets-3.1.0/include/wx/msw/icon.h: - -C:/wxWidgets-3.1.0/include/wx/artprov.h: - -C:/wxWidgets-3.1.0/include/wx/iconbndl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h: - -C:/wxWidgets-3.1.0/include/wx/imaglist.h: - -C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h: - -C:/wxWidgets-3.1.0/include/wx/window.h: - -C:/wxWidgets-3.1.0/include/wx/event.h: - -C:/wxWidgets-3.1.0/include/wx/clntdata.h: - -C:/wxWidgets-3.1.0/include/wx/cursor.h: - -C:/wxWidgets-3.1.0/include/wx/msw/cursor.h: - -C:/wxWidgets-3.1.0/include/wx/utils.h: - -C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h: - -C:/wxWidgets-3.1.0/include/wx/mousestate.h: - -C:/wxWidgets-3.1.0/include/wx/kbdstate.h: - -C:/wxWidgets-3.1.0/include/wx/platinfo.h: - -C:/wxWidgets-3.1.0/include/wx/thread.h: - -C:/wxWidgets-3.1.0/include/wx/tracker.h: - -C:/wxWidgets-3.1.0/include/wx/meta/convertible.h: - -C:/wxWidgets-3.1.0/include/wx/meta/removeref.h: - -C:/wxWidgets-3.1.0/include/wx/font.h: - -C:/wxWidgets-3.1.0/include/wx/msw/font.h: - -C:/wxWidgets-3.1.0/include/wx/region.h: - -C:/wxWidgets-3.1.0/include/wx/msw/region.h: - -C:/wxWidgets-3.1.0/include/wx/validate.h: - -C:/wxWidgets-3.1.0/include/wx/accel.h: - -C:/wxWidgets-3.1.0/include/wx/msw/accel.h: - -C:/wxWidgets-3.1.0/include/wx/msw/window.h: - -C:/wxWidgets-3.1.0/include/wx/settings.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_all.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_activityindicator.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_animatctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bannerwindow.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpbt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmpcbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_bttn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_cald.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_chckl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_choic.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_choicbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_clrpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_cmdlinkbn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_collpane.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_combo.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_comboctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_datectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_dirpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_dlg.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_editlbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_filectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_filepicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_fontpicker.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_frame.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_gauge.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_gdctl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_grid.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_html.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_htmllbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_hyperlink.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listc.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_listbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_mdi.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_menu.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_notbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_odcombo.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_panel.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_propdlg.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_radbx.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_scrol.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_scwin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_simplebook.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_sizer.h: - -C:/wxWidgets-3.1.0/include/wx/sizer.h: - -C:/wxWidgets-3.1.0/include/wx/gbsizer.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_slidr.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_spin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_split.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_srchctrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_statbar.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbox.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stbmp.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_sttxt.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_stlin.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_text.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_tglbtn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_timectrl.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolb.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_toolbk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_tree.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_treebk.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_unkwn.h: - -C:/wxWidgets-3.1.0/include/wx/xrc/xh_wizrd.h: diff --git a/Project/Release/wxmsw310u_gcc_cl.dll b/Project/Release/wxmsw310u_gcc_cl.dll Binary files differnew file mode 100644 index 0000000..9422e8e --- /dev/null +++ b/Project/Release/wxmsw310u_gcc_cl.dll diff --git a/Project/Release/wxmsw310u_gl_gcc_cl.dll b/Project/Release/wxmsw310u_gl_gcc_cl.dll Binary files differnew file mode 100644 index 0000000..0af00c8 --- /dev/null +++ b/Project/Release/wxmsw310u_gl_gcc_cl.dll diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 8e46e06..ec27039 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -1,9 +1,29 @@ #include "Workspace.h" +#include "MouseEventsHandler.h" -Workspace::Workspace(wxWindow* parent, wxString name) : WorkspaceBase(parent) +Camera::Camera() +{ + m_translation = wxPoint2DDouble(0,0); + m_scale = 1.0; +} + +Camera::~Camera() +{ +} + +wxPoint2DDouble Camera::ScreenToWorld(wxPoint2DDouble screenCoords) +{ + return wxPoint2DDouble(screenCoords.m_x / m_scale - m_translation.m_x, + screenCoords.m_y / m_scale - m_translation.m_y); +} + +Workspace::Workspace(wxWindow* parent, wxString name /*, int workspaceID*/) : WorkspaceBase(parent) { m_name = name; + // m_workspaceID = workspaceID; m_glContext = new wxGLContext(m_glCanvas); + m_mouseEventsHandler = new MouseEventsHandler(this); + m_camera = new Camera(); } Workspace::~Workspace() @@ -13,6 +33,9 @@ Workspace::~Workspace() if(!(*it)) delete *it; it++; } + + delete m_camera; + delete m_mouseEventsHandler; } void Workspace::OnPaint(wxPaintEvent& event) @@ -22,15 +45,16 @@ void Workspace::OnPaint(wxPaintEvent& event) SetViewport(); // desenhar - std::vector<Element*>::iterator it = m_elementList.begin(); - while(it != m_elementList.end()) { + std::vector<Element*>::iterator it = m_elementList.begin(); + while(it != m_elementList.end()) { Element* element = *it; - element->Draw(wxPoint2DDouble(0,0), 1); + element->Draw(m_camera->GetTranslation(), m_camera->GetScale()); it++; } glFlush(); m_glCanvas->SwapBuffers(); + event.Skip(); } void Workspace::SetViewport() @@ -56,9 +80,32 @@ void Workspace::SetViewport() glMatrixMode(GL_MODELVIEW); glLoadIdentity(); } + void Workspace::OnLeftClickDown(wxMouseEvent& event) -{ - Bus* newBus = new Bus(event.GetPosition()); - m_elementList.push_back(newBus); - Redraw(); +{ + if(m_insertMode) m_insertMode = false; + event.Skip(); +} + +/* +void Workspace::OnKeyDown(wxKeyEvent& event) +{ + if(event.GetKeyCode() == 'B' && !m_insertMode) { + Bus* newBus = new Bus(m_camera->ScreenToWorld(event.GetPosition())); + m_elementList.push_back(newBus); + m_insertMode = true; + Redraw(); + } + event.Skip(); +}*/ + +void Workspace::OnMouseMotion(wxMouseEvent& event) +{ + if(m_insertMode) { + std::vector<Element*>::iterator it = m_elementList.end() - 1; + Element* element = *it; + element->SetPosition(m_camera->ScreenToWorld(event.GetPosition())); + Redraw(); + } + event.Skip(); } diff --git a/Project/Workspace.h b/Project/Workspace.h index 193d370..ca4245f 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -6,12 +6,19 @@ #include <wx/dcclient.h> #include <wx/msgdlg.h> +class MouseEventsHandler; + #include "WorkspaceBase.h" +//#include "MouseEventsHandler.h" #include "Bus.h" +class Camera; + class Workspace : public WorkspaceBase { protected: + virtual void OnMouseMotion(wxMouseEvent& event); + virtual void OnKeyDown(wxKeyEvent& event) = 0; virtual void OnLeftClickDown(wxMouseEvent& event); virtual void OnPaint(wxPaintEvent& event); @@ -19,17 +26,44 @@ class Workspace : public WorkspaceBase wxGLContext* m_glContext; wxString m_name; - - std::vector<Element*> m_elementList; + + bool m_insertMode = false; + bool m_dragMode = false; + + std::vector<Element*> m_elementList; public: Workspace(wxWindow* parent, wxString name = wxEmptyString); ~Workspace(); - - void Redraw() { this->Refresh(); } + + MouseEventsHandler* m_mouseEventsHandler; + Camera* m_camera; wxString GetName() const { return m_name; } void SetName(wxString name) { m_name = name; } + void SetDragMode(bool dragMode) { this->m_dragMode = dragMode; } + void SetInsertMode(bool insertMode) { this->m_insertMode = insertMode; } + bool IsDragMode() const { return m_dragMode; } + const std::vector<Element*>& GetElementList() const { return m_elementList; } + bool IsInsertMode() const { return m_insertMode; } + void Redraw() { this->Refresh(); } +}; + +class Camera +{ + private: + wxPoint2DDouble m_translation; + double m_scale; + + public: + Camera(); + ~Camera(); + + void SetScale(double scale) { this->m_scale = scale; } + void SetTranslation(const wxPoint2DDouble& translation) { this->m_translation = translation; } + double GetScale() const { return m_scale; } + const wxPoint2DDouble GetTranslation() const { return m_translation; } + wxPoint2DDouble ScreenToWorld(wxPoint2DDouble screenCoords); }; #endif // WORKSPACE_H diff --git a/Project/Workspace.wxcp b/Project/Workspace.wxcp index d29b978..3f13f68 100644 --- a/Project/Workspace.wxcp +++ b/Project/Workspace.wxcp @@ -278,6 +278,20 @@ "m_functionNameAndSignature": "OnLeftClickDown(wxMouseEvent& event)", "m_description": "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally call event.Skip() to allow the default processing to take place as otherwise the window under mouse wouldn't get the focus.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MOTION", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnMouseMotion(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MOTION event", + "m_noBody": false }], "m_children": [] }] diff --git a/Project/WorkspaceBase.cpp b/Project/WorkspaceBase.cpp index 9e34efc..f43e6f4 100644 --- a/Project/WorkspaceBase.cpp +++ b/Project/WorkspaceBase.cpp @@ -45,6 +45,8 @@ WorkspaceBase::WorkspaceBase(wxWindow* parent, wxWindowID id, const wxPoint& pos // Connect events m_glCanvas->Connect(wxEVT_PAINT, wxPaintEventHandler(WorkspaceBase::OnPaint), NULL, this); m_glCanvas->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(WorkspaceBase::OnLeftClickDown), NULL, this); + m_glCanvas->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(WorkspaceBase::OnKeyDown), NULL, this); + m_glCanvas->Connect(wxEVT_MOTION, wxMouseEventHandler(WorkspaceBase::OnMouseMotion), NULL, this); } @@ -52,5 +54,7 @@ WorkspaceBase::~WorkspaceBase() { m_glCanvas->Disconnect(wxEVT_PAINT, wxPaintEventHandler(WorkspaceBase::OnPaint), NULL, this); m_glCanvas->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(WorkspaceBase::OnLeftClickDown), NULL, this); + m_glCanvas->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(WorkspaceBase::OnKeyDown), NULL, this); + m_glCanvas->Disconnect(wxEVT_MOTION, wxMouseEventHandler(WorkspaceBase::OnMouseMotion), NULL, this); } diff --git a/Project/WorkspaceBase.h b/Project/WorkspaceBase.h index 4c11346..a73e8d3 100644 --- a/Project/WorkspaceBase.h +++ b/Project/WorkspaceBase.h @@ -39,6 +39,8 @@ protected: protected: virtual void OnPaint(wxPaintEvent& event) { event.Skip(); } virtual void OnLeftClickDown(wxMouseEvent& event) { event.Skip(); } + virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); } + virtual void OnMouseMotion(wxMouseEvent& event) { event.Skip(); } public: wxGLCanvas* GetGlCanvas() { return m_glCanvas; } |