AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Motif compile fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-06-21 21:37:49 +00:00
parent 7f24bd194b
commit d75638f85f
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/motif/dialog.h
View File

@ -88,6 +88,7 @@ public:
void OnOK(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
void OnApply(wxCommandEvent& event); void OnApply(wxCommandEvent& event);
void OnCancel(wxCommandEvent& event); void OnCancel(wxCommandEvent& event);
void OnPaint(wxPaintEvent &event);
// Responds to colour changes // Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);

8
include/wx/motif/window.h
View File

@ -103,8 +103,8 @@ public:
const wxRect* rect = (wxRect *) NULL ); const wxRect* rect = (wxRect *) NULL );
virtual void SetSizeHints(int minW, int minH, virtual void SetSizeHints(int minW, int minH,
int maxW, int maxH, int maxW = -1, int maxH = -1,
int incW, int incH); int incW = -1, int incH = -1);
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
@ -237,8 +237,10 @@ protected:
// accelerator table, and try to find what menu id or window (beneath it) // accelerator table, and try to find what menu id or window (beneath it)
// has this ID. Then construct an appropriate command // has this ID. Then construct an appropriate command
// event and send it. // event and send it.
public:
virtual bool ProcessAccelerator(wxKeyEvent& event); virtual bool ProcessAccelerator(wxKeyEvent& event);
protected:
// unmanage and destroy an X widget f it's !NULL (passing NULL is ok) // unmanage and destroy an X widget f it's !NULL (passing NULL is ok)
void UnmanageAndDestroy(WXWidget widget); void UnmanageAndDestroy(WXWidget widget);

2
src/generic/colrdlgg.cpp
View File

@ -184,7 +184,9 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
void wxGenericColourDialog::OnPaint(wxPaintEvent& event) void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
{ {
#ifndef __WXMOTIF__
wxDialog::OnPaint(event); wxDialog::OnPaint(event);
#endif
wxPaintDC dc(this); wxPaintDC dc(this);

5
src/motif/Makefile.am
View File

@ -113,8 +113,6 @@ libwx_motif_la_SOURCES = \
prntdlgg.cpp \ prntdlgg.cpp \
progdlgg.cpp \ progdlgg.cpp \
prop.cpp \ prop.cpp \
propform.cpp \
proplist.cpp \
sashwin.cpp \ sashwin.cpp \
scrolwin.cpp \ scrolwin.cpp \
splitter.cpp \ splitter.cpp \
@ -180,6 +178,9 @@ libwx_motif_la_SOURCES = \
wave.cpp \ wave.cpp \
window.cpp window.cpp
# propform.cpp \
# proplist.cpp \
# these are the sources which we build by our own rules # these are the sources which we build by our own rules
# #
# TODO: parser.y can be included into SOURCES, but for the sake of my life I # TODO: parser.y can be included into SOURCES, but for the sake of my life I

5
src/motif/dialog.cpp
View File

@ -586,6 +586,11 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
closing.DeleteObject(this); closing.DeleteObject(this);
} }
void wxDialog::OnPaint(wxPaintEvent &WXUNUSED(event))
{
// added for compatiblity only
}
// Destroy the window (delayed, if a managed window) // Destroy the window (delayed, if a managed window)
bool wxDialog::Destroy() bool wxDialog::Destroy()
{ {