Some stubs corrections; Motif corrections incl. busy cursor fix; doc corrections

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

src/generic/panelg.cpp

@@ -51,7 +51,7 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
-    m_lastFocus = NULL;
+    m_lastFocus = 0;
 
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 

src/motif/dialog.cpp

@@ -342,6 +342,11 @@ void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 }
 
+void wxDialog::DoSetClientSize(int width, int height)
+{
+    wxWindow::SetSize(-1, -1, width, height);
+}
+
 void wxDialog::SetTitle(const wxString& title)
 {
     m_dialogTitle = title;

src/motif/utils.cpp

@@ -556,6 +556,9 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     Display *display = (Display*) win->GetXDisplay();
     
     Window xwin = (Window) win->GetXWindow();
+    if (!xwin)
+       return;
+
     XSetWindowAttributes attrs;
     
     if (cursor)

src/motif/window.cpp

@@ -747,7 +747,7 @@ void wxWindow::GetClientSize(int *x, int *y) const
     *x = xx; *y = yy;
 }
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // A bit of optimization to help sort out the flickers.
     int oldX, oldY, oldW, oldH;
@@ -819,7 +819,7 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
     */
 }
 
-void wxWindow::SetClientSize(int width, int height)
+void wxWindow::DoSetClientSize(int width, int height)
 {
     if (m_drawingArea)
     {
@@ -2307,12 +2307,18 @@ void wxDeleteWindowFromTable(Widget w)
 // Get the underlying X window and display
 WXWindow wxWindow::GetXWindow() const
 {
-    return (WXWindow) XtWindow((Widget) GetMainWidget());
+    if (GetMainWidget())
+        return (WXWindow) XtWindow((Widget) GetMainWidget());
+    else
+        return (WXWindow) 0;
 }
 
 WXDisplay *wxWindow::GetXDisplay() const
 {
-    return (WXDisplay*) XtDisplay((Widget) GetMainWidget());
+    if (GetMainWidget())
+        return (WXDisplay*) XtDisplay((Widget) GetMainWidget());
+    else
+        return (WXDisplay*) NULL;
 }
 
 WXWidget wxWindow::GetMainWidget() const

src/stubs/filedlg.cpp

@@ -59,7 +59,7 @@ wxString wxFileSelector(const char *title,
         return wxEmptyString;
 }
 
-char *wxFileSelectorEx(const char *title,
+wxString wxFileSelectorEx(const char *title,
                        const char *defaultDir,
                        const char *defaultFileName,
                        int* defaultFilterIndex,

src/stubs/makefile.unx

@@ -51,7 +51,7 @@ LIB_CPP_SRC=\
  ../common/framecmn.cpp \
  ../common/stream.cpp \
  ../common/datstrm.cpp \
- ../common/fstream.cpp \
+ ../common/wfstream.cpp \
  ../common/mstream.cpp \
  ../common/zstream.cpp \
  ../common/objstrm.cpp \

src/stubs/thread.cpp

@@ -17,6 +17,8 @@
 #include "wx/thread.h"
 #include "wx/utils.h"
 
+#if wxUSE_THREADS
+
 enum thread_state {
   STATE_IDLE = 0,
   STATE_RUNNING,
@@ -259,3 +261,5 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
+#endif
+  // wxUSE_THREADS