jlpoole/MotionCal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix window resize on Mac and Windows

Browse source
This commit is contained in:
PaulStoffregen 2016-03-16 01:30:33 -07:00
commit a01864b928
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -43,7 +43,8 @@ gui: gui.o portlist.o $(OBJS)
$(CXX) -s $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl` $(CXX) -s $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl`
gui.exe: gui gui.exe: gui
cp gui gui.exe cp gui $@
-./cp_windows.sh $@
gui.app: gui Info.plist gui.app: gui Info.plist
mkdir -p $@/Contents/MacOS mkdir -p $@/Contents/MacOS

10
cp_windows.sh Executable file
View file

@ -0,0 +1,10 @@
#! /bin/sh
# copy a file to Windows machine for testing
ftp xp << EOT
pass
bin
put $1
EOT

4
gui.cpp
View file

@ -110,7 +110,7 @@ MyFrame::MyFrame(wxWindow *parent, wxWindowID id, const wxString &title,
WX_GL_DOUBLEBUFFER, WX_GL_DOUBLEBUFFER,
0}; 0};
m_canvas = new MyCanvas(this, wxID_ANY, gl_attrib); m_canvas = new MyCanvas(this, wxID_ANY, gl_attrib);
m_canvas->SetMinSize(wxSize(340,340)); m_canvas->SetMinSize(wxSize(400,400));
middlesizer->Add(m_canvas, 1, wxEXPAND | wxALL, 10); middlesizer->Add(m_canvas, 1, wxEXPAND | wxALL, 10);
topsizer->SetSizeHints(this); topsizer->SetSizeHints(this);
@ -248,7 +248,7 @@ bool MyApp::OnInit()
wxPoint pos(100, 100); wxPoint pos(100, 100);
MyFrame *frame = new MyFrame(NULL, -1, wxT("IMU Read"), pos, wxSize(1120,760), MyFrame *frame = new MyFrame(NULL, -1, wxT("IMU Read"), pos, wxSize(1120,760),
wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER)); wxDEFAULT_FRAME_STYLE);
frame->Show( true ); frame->Show( true );
return true; return true;
} }