From: Robert Roebling <robert@roebling.de>
Date: Mon, 21 Jun 1999 21:37:49 +0000 (+0000)
Subject:   Motif compile fixes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d75638f85f4f385f3cfdc3e8a2a9acc6a686e7b2

  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 2fde3e3060..21107d0282 100644
--- 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 OnPaint(wxPaintEvent &event);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index e174a4538e..fed6259e2d 100644
--- 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,
-                              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
@@ -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.
+public:
     virtual bool ProcessAccelerator(wxKeyEvent& event);
-
+    
+protected:
     // 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 5e84552d4a..e445147cf1 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -184,7 +184,9 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
+#ifndef __WXMOTIF__
   wxDialog::OnPaint(event);
+#endif
 
   wxPaintDC dc(this);
 
diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am
index 1eb1cc0bef..080c7f678c 100644
--- a/src/motif/Makefile.am
+++ b/src/motif/Makefile.am
@@ -113,8 +113,6 @@ libwx_motif_la_SOURCES = \
  prntdlgg.cpp \
  progdlgg.cpp \
  prop.cpp \
- propform.cpp \
- proplist.cpp \
  sashwin.cpp \
  scrolwin.cpp \
  splitter.cpp \
@@ -180,6 +178,9 @@ libwx_motif_la_SOURCES = \
  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
diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 41d930d7f1..775b1ca779 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -586,6 +586,11 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
+void wxDialog::OnPaint(wxPaintEvent &WXUNUSED(event))
+{
+  // added for compatiblity only
+}
+
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {