Motif compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 2fde3e30607c9ab10548043bd97fc7386da0da67..21107d02824a9e0e95cf7ad3ceb35234740d6266 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -88,6 +88,7 @@ public:
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);

+    void OnPaint(wxPaintEvent &event);

 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index e174a4538e7538b4d6507e6a72f8f589cb0f3f88..fed6259e2dfe46053bf2a5a1c28da3db7efd6dd3 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -103,8 +103,8 @@ public:
                                const wxRect* rect = (wxRect *) NULL );
 
     virtual void SetSizeHints(int minW, int minH,
                                const wxRect* rect = (wxRect *) NULL );
 
     virtual void SetSizeHints(int minW, int minH,

-                              int maxW, int maxH,
-                              int incW, int incH);
+                              int maxW = -1, int maxH = -1,
+                              int incW = -1, int incH = -1);

 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP


@@ -237,8 +237,10 @@ protected:
     // accelerator table, and try to find what menu id or window (beneath it)
     // has this ID. Then construct an appropriate command
     // event and send it.
     // accelerator table, and try to find what menu id or window (beneath it)
     // has this ID. Then construct an appropriate command
     // 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)
     void UnmanageAndDestroy(WXWidget widget);
 
     // unmanage and destroy an X widget f it's !NULL (passing NULL is ok)
     void UnmanageAndDestroy(WXWidget widget);
 

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 5e84552d4aa71a2823953cb7f483b2ab84cc7552..e445147cf1ab6c5c95057b6bd10291b375651876 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -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);
 

diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am
index 1eb1cc0befb9cd1e72db14397228722cd8594263..080c7f678c90538c23f8eb1f040ed71b83d398e8 100644 (file)
--- a/src/motif/Makefile.am
+++ b/src/motif/Makefile.am
@@ -113,8 +113,6 @@ libwx_motif_la_SOURCES = \
  prntdlgg.cpp \
  progdlgg.cpp \
  prop.cpp \
  prntdlgg.cpp \
  progdlgg.cpp \
  prop.cpp \

- propform.cpp \
- proplist.cpp \

  sashwin.cpp \
  scrolwin.cpp \
  splitter.cpp \
  sashwin.cpp \
  scrolwin.cpp \
  splitter.cpp \


@@ -180,6 +178,9 @@ libwx_motif_la_SOURCES = \
  wave.cpp \
  window.cpp
 
  wave.cpp \
  window.cpp
 

+# propform.cpp \
+# proplist.cpp \
+ 

 # 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
 # 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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 41d930d7f16c8b5842d5373201c8a6f7b3435180..775b1ca77968916c240d435cafb4aeb8cd2de0a6 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -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)
 bool wxDialog::Destroy()
 {
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {