empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rr1-maint'

Browse source
This commit is contained in:
Ilari Liusvaara 2013-04-03 18:42:07 +03:00
commit 53d436f399
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/platform/wxwidgets/window_status.hpp
View file

@ -16,6 +16,7 @@ public:
bool AcceptsFocus () const;
void on_focus(wxFocusEvent& e);
void on_paint(wxPaintEvent& e);
void on_erase(wxEraseEvent& e);
bool dirty;
wxWindow* parent;
wxWindow* tfocuswin;

7
src/platform/wxwidgets/editor-movie.cpp
View file

@ -294,6 +294,7 @@ private:
void signal_repaint();
void on_scroll(wxScrollEvent& e);
void on_paint(wxPaintEvent& e);
void on_erase(wxEraseEvent& e);
void on_mouse(wxMouseEvent& e);
void on_popup_menu(wxCommandEvent& e);
private:
@ -406,6 +407,7 @@ wxeditor_movie::_moviepanel::_moviepanel(wxeditor_movie* v)
{
m = v;
Connect(wxEVT_PAINT, wxPaintEventHandler(_moviepanel::on_paint), NULL, this);
Connect(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(_moviepanel::on_erase), NULL, this);
new_width = 0;
new_height = 0;
moviepos = 0;
@ -1203,6 +1205,11 @@ void wxeditor_movie::_moviepanel::on_scroll(wxScrollEvent& e)
signal_repaint();
}
void wxeditor_movie::_moviepanel::on_erase(wxEraseEvent& e)
{
//Blank.
}
void wxeditor_movie::_moviepanel::on_paint(wxPaintEvent& e)
{
auto size = fb.get_pixels();

6
src/platform/wxwidgets/status.cpp
View file

@ -31,11 +31,17 @@ wxwin_status::panel::panel(wxWindow* _parent, wxWindow* focuswin, unsigned lines
auto s = statusvars.get_pixels();
SetMinSize(wxSize(s.first, s.second));
this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxwin_status::panel::on_paint), NULL, this);
this->Connect(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(panel::on_erase), NULL, this);
this->Connect(wxEVT_SET_FOCUS, wxFocusEventHandler(wxwin_status::panel::on_focus), NULL, this);
watch_flag = 0;
previous_size = 0;
}
void wxwin_status::panel::on_erase(wxEraseEvent& e)
{
//Blank.
}
bool wxwin_status::panel::AcceptsFocus () const
{
return false;