redraw fixes for OSX

[wxWidgets.git] / src / motif / filedlg.cpp

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 8f4d17b89980550683b4f4189298c15a8e6e0131..c4ea2a4f4edcb7530b132cae6230eac8ca76308e 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -151,9 +151,11 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
 
 static wxString ParseWildCard( const wxString& wild )
 {
 
 static wxString ParseWildCard( const wxString& wild )
 {

+#ifdef __WXDEBUG__

     static const wxChar* msg =
         _T("Motif file dialog does not understand this ")
         _T("wildcard syntax");
     static const wxChar* msg =
         _T("Motif file dialog does not understand this ")
         _T("wildcard syntax");

+#endif

 
     wxStringTokenizer tok( wild, _T("|") );
 
 
     wxStringTokenizer tok( wild, _T("|") );
 


@@ -190,7 +192,9 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
 
     // Change colour of the scrolled areas of the listboxes
     Widget listParent = XtParent (widget);
 
     // Change colour of the scrolled areas of the listboxes
     Widget listParent = XtParent (widget);

+#if 0

     wxWindow::DoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE);
     wxWindow::DoChangeBackgroundColour((WXWidget) listParent, *wxWHITE, TRUE);

+#endif

 
     Widget hsb = (Widget) 0;
     Widget vsb = (Widget) 0;
 
     Widget hsb = (Widget) 0;
     Widget vsb = (Widget) 0;


@@ -260,7 +264,9 @@ int wxFileDialog::ShowModal()
     Widget shell = XtParent(fileSel);
 
     if (!m_message.IsNull())
     Widget shell = XtParent(fileSel);
 
     if (!m_message.IsNull())

-        XtVaSetValues(shell, XmNtitle, (char*) (const char*) m_message, NULL);
+        XtVaSetValues(shell,
+                      XmNtitle, wxConstCast(m_message.c_str(), char),
+                      NULL);

 
     wxString entirePath("");
 
 
     wxString entirePath("");
 


@@ -277,11 +283,6 @@ int wxFileDialog::ShowModal()
         entirePath = m_fileName;
     }
 
         entirePath = m_fileName;
     }
 

-    if (entirePath != "")
-    {
-        XmTextSetString(selectionWidget, (char*) (const char*) entirePath);
-    }
-

     if (m_wildCard != "")
     {
         // return something understandable by Motif
     if (m_wildCard != "")
     {
         // return something understandable by Motif


@@ -292,7 +293,7 @@ int wxFileDialog::ShowModal()
         else
             filter = wildCard;
 
         else
             filter = wildCard;
 

-        XmTextSetString(filterWidget, (char*)filter.c_str());
+        XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));

         XmFileSelectionDoSearch(fileSel, NULL);
     }
 
         XmFileSelectionDoSearch(fileSel, NULL);
     }
 


@@ -300,14 +301,17 @@ int wxFileDialog::ShowModal()
     // file selector on Solaris 1.5.1.
     if ( m_dir != "" )
     {
     // file selector on Solaris 1.5.1.
     if ( m_dir != "" )
     {

-        XmString thePath = XmStringCreateLtoR ((char*) (const char*) m_dir,
-            XmSTRING_DEFAULT_CHARSET);
+        wxXmString thePath( m_dir );

 
         XtVaSetValues (fileSel,
 
         XtVaSetValues (fileSel,

-            XmNdirectory, thePath,
+            XmNdirectory, thePath(),

             NULL);
             NULL);

+    }

 
 

-        XmStringFree(thePath);
+    if (entirePath != "")
+    {
+        XmTextSetString(selectionWidget,
+                        wxConstCast(entirePath.c_str(), char));

     }
 
     XtAddCallback(fileSel, XmNcancelCallback, (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL);
     }
 
     XtAddCallback(fileSel, XmNcancelCallback, (XtCallbackProc)wxFileSelCancel, (XtPointer)NULL);


@@ -382,7 +386,7 @@ int wxFileDialog::ShowModal()
 static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
 static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {

-    char *ext = (char *)extension;
+    char *ext = wxConstCast(extension, char);

 
     wxString prompt;
     wxString str;
 
     wxString prompt;
     wxString str;