projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[wxWidgets.git]
/
src
/
mac
/
carbon
/
control.cpp
diff --git
a/src/mac/carbon/control.cpp
b/src/mac/carbon/control.cpp
index 220ff1e0a9d84e917fdd2e01d26e417a33794a85..5065b239e9dd15a792c6d9ebe6432b4b1fd74110 100644
(file)
--- a/
src/mac/carbon/control.cpp
+++ b/
src/mac/carbon/control.cpp
@@
-18,7
+18,6
@@
#include "wx/tabctrl.h"
#include "wx/spinbutt.h"
#include "wx/tabctrl.h"
#include "wx/spinbutt.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
BEGIN_EVENT_TABLE(wxControl, wxWindow)
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
BEGIN_EVENT_TABLE(wxControl, wxWindow)
@@
-26,7
+25,6
@@
BEGIN_EVENT_TABLE(wxControl, wxWindow)
EVT_CHAR( wxControl::OnKeyDown )
EVT_PAINT( wxControl::OnPaint )
END_EVENT_TABLE()
EVT_CHAR( wxControl::OnKeyDown )
EVT_PAINT( wxControl::OnPaint )
END_EVENT_TABLE()
-#endif
#include <wx/mac/uma.h>
#include <wx/mac/uma.h>
@@
-587,6
+585,14
@@
void wxControl::OnPaint(wxPaintEvent& event)
// wxWindow::OnPaint( event ) ;
}
}
// wxWindow::OnPaint( event ) ;
}
}
+void wxControl::OnEraseBackground(wxEraseEvent& event)
+{
+ // In general, you don't want to erase the background of a control,
+ // or you'll get a flicker.
+ // TODO: move this 'null' function into each control that
+ // might flicker.
+}
+
void wxControl::OnKeyDown( wxKeyEvent &event )
{
void wxControl::OnKeyDown( wxKeyEvent &event )
{