diff options
Diffstat (limited to 'hacks')
| -rw-r--r-- | hacks/gl/basic_gl_pane.cc | 6 | ||||
| -rw-r--r-- | hacks/gl/shader.cc | 2 | ||||
| -rw-r--r-- | hacks/small_loop | 9 | ||||
| -rw-r--r-- | hacks/text.cc | 6 |
4 files changed, 16 insertions, 7 deletions
diff --git a/hacks/gl/basic_gl_pane.cc b/hacks/gl/basic_gl_pane.cc index 565bf4cee..d6b01462f 100644 --- a/hacks/gl/basic_gl_pane.cc +++ b/hacks/gl/basic_gl_pane.cc @@ -33,7 +33,7 @@ DrawableThing* sprite; bool MyApp::OnInit() { wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); - frame = new wxFrame((wxFrame *)NULL, -1, wxT("Hello GL World"), wxPoint(50,50), wxSize(400,200)); + frame = new wxFrame((wxFrame *)NULL, -1, char_to_wx("Hello GL World"), wxPoint(50,50), wxSize(400,200)); int args[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, 0}; @@ -72,7 +72,7 @@ void BasicGLPane::keyPressed(wxKeyEvent& event) {} void BasicGLPane::keyReleased(wxKeyEvent& event) {} BasicGLPane::BasicGLPane(wxFrame* parent, int* args) : -wxGLCanvas(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"), args) +wxGLCanvas(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, char_to_wx("GLCanvas"), args) { } @@ -150,7 +150,7 @@ void BasicGLPane::render( wxPaintEvent& evt ) if(image == NULL) { - image = new Image( wxT("myfile.png") ); + image = new Image(char_to_wx("myfile.png")); sprite = new DrawableThing(image); } diff --git a/hacks/gl/shader.cc b/hacks/gl/shader.cc index 8d5f5fe70..c6cdb8593 100644 --- a/hacks/gl/shader.cc +++ b/hacks/gl/shader.cc @@ -35,7 +35,7 @@ public: bool OnInit() { auto sizer = new wxBoxSizer(wxHORIZONTAL); - _frame = new wxFrame(nullptr, wxID_ANY, wxT("Hello world")); + _frame = new wxFrame(nullptr, wxID_ANY, char_to_wx("Hello world")); _canvas = new GLCanvas(_frame); sizer->Add(_canvas->get(), 1, wxEXPAND); _frame->SetSizerAndFit(sizer); diff --git a/hacks/small_loop b/hacks/small_loop new file mode 100644 index 000000000..20e52962f --- /dev/null +++ b/hacks/small_loop @@ -0,0 +1,9 @@ +SIZE=1G + +fallocate drive.img -l $SIZE +mkfs.ext4 drive.img +mkdir -p small +sudo mount -oloop drive.img small +sudo mkdir small/dcp +sudo chown $USER small/dcp + diff --git a/hacks/text.cc b/hacks/text.cc index bf391a325..ff5d6f8b8 100644 --- a/hacks/text.cc +++ b/hacks/text.cc @@ -19,10 +19,10 @@ int main () Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create ( data, - Cairo::FORMAT_ARGB32, + Cairo::ImageSurface::Format::ARGB32, width, height, /* Cairo ARGB32 means first byte blue, second byte green, third byte red, fourth byte alpha */ - Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, width) + Cairo::ImageSurface::format_stride_for_width(Cairo::ImageSurface::Format::ARGB32, width) ); Cairo::RefPtr<Cairo::Context> context = Cairo::Context::create (surface); @@ -33,7 +33,7 @@ int main () context->rectangle (0, 0, width, height); context->fill (); - layout->set_alignment (Pango::ALIGN_LEFT); + layout->set_alignment (Pango::Alignment::LEFT); context->set_line_width (1); // Cairo::FontOptions fo; |