diff options
| -rw-r--r-- | PSP.workspace | 4 | ||||
| -rw-r--r-- | Project/MathExpression.cpp | 2 | ||||
| -rw-r--r-- | Project/Project.project | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/PSP.workspace b/PSP.workspace index 95b47db..a37d541 100644 --- a/PSP.workspace +++ b/PSP.workspace @@ -6,7 +6,7 @@ <Environment/> <Project Name="Project" ConfigName="Release_Windows_x32"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="Release_Windows_x64" Selected="yes"> + <WorkspaceConfiguration Name="Release_Windows_x64" Selected="no"> <Environment/> <Project Name="Project" ConfigName="Release_Windows_x64"/> </WorkspaceConfiguration> @@ -14,7 +14,7 @@ <Environment/> <Project Name="Project" ConfigName="Debug_Windows_x64"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="Release_Ubuntu_x64" Selected="no"> + <WorkspaceConfiguration Name="Release_Ubuntu_x64" Selected="yes"> <Environment/> <Project Name="Project" ConfigName="Release_Ubuntu_x64"/> </WorkspaceConfiguration> diff --git a/Project/MathExpression.cpp b/Project/MathExpression.cpp index 1657880..066825f 100644 --- a/Project/MathExpression.cpp +++ b/Project/MathExpression.cpp @@ -122,7 +122,7 @@ void MathExpression::Draw(wxPoint2DDouble translation, double scale) const DrawNodes(); } -bool MathExpression::ShowForm(wxWindowMSW* parent, Element* element) +bool MathExpression::ShowForm(wxWindow* parent, Element* element) { MathExpressionForm* mathExprForm = new MathExpressionForm(parent, this); if(mathExprForm->ShowModal() == wxID_OK) { diff --git a/Project/Project.project b/Project/Project.project index 2d8fb46..882f7a2 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -428,7 +428,7 @@ <Preprocessor Value="NDEBUG"/> <Preprocessor Value="UNICODE"/> </Compiler> - <Linker Options="$(shell wx-config --libs std,ribbon,aui,propgrid,richtext,gl)" Required="yes"> + <Linker Options="$(shell wx-config --libs std,ribbon,aui,propgrid,richtext,stc,gl)" Required="yes"> <Library Value="GLU"/> <Library Value="GL"/> </Linker> |