define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

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

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index e54cb2d4d652020d3d34b8b7e027733d0c077895..974b18b796ff56e3805dc05c66e1dbaed7da27e5 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.cpp
+// Name:        src/motif/filedlg.cpp
 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
@@ -9,25 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtWindow XTWINDOW
+#include "wx/filedlg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/filedlg.h"
-#include "wx/intl.h"
-#include "wx/app.h"
-#include "wx/settings.h"
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"
 
@@ -60,21 +53,21 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 #define wxFSB_HEIGHT               500
 
 
-wxString wxFileDialog::m_fileSelectorAnswer = "";
+wxString wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
 bool wxFileDialog::m_fileSelectorReturned = false;
 
 static void wxFileSelClose(Widget WXUNUSED(w),
                            void* WXUNUSED(client_data),
                            XmAnyCallbackStruct *WXUNUSED(call_data))
 {
-    wxFileDialog::m_fileSelectorAnswer = "";
+    wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
     wxFileDialog::m_fileSelectorReturned = true;
 }
 
 void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
                      XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
 {
-    wxFileDialog::m_fileSelectorAnswer = "";
+    wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
     wxFileDialog::m_fileSelectorReturned = true;
 }
 
@@ -82,7 +75,7 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
 {
     char *filename = NULL;
     if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
-        wxFileDialog::m_fileSelectorAnswer = "";
+        wxFileDialog::m_fileSelectorAnswer = wxEmptyString;
         wxFileDialog::m_fileSelectorReturned = true;
     } else {
         if (filename) {
@@ -118,8 +111,8 @@ static wxString ParseWildCard( const wxString& wild )
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
-                           long style, const wxPoint& pos)
-             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+                           long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 {
     m_filterIndex = 1;
 }
@@ -173,30 +166,31 @@ int wxFileDialog::ShowModal()
     Arg args[10];
     int ac = 0;
 
-    wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL);
+    if (m_backgroundColour.Ok())
+    {
+        wxComputeColours (dpy, & m_backgroundColour, NULL);
 
-    XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
-    XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;
-    XtSetArg(args[ac], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++;
-    XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++;
+        XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
+        XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;
+        XtSetArg(args[ac], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++;
+        XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++;
+    }
 
     wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
-    if ( wxFont::GetFontTag() == (WXString) XmNfontList )
-    {
-        XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++;
-        XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++;
-        XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++;
-    }
-    else
-    {
-        XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++;
-        XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++;
-        XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++;
-    }
+#if __WXMOTIF20__ && !__WXLESSTIF__
+    XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++;
+#else
+    XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++;
+#endif
 
     Widget fileSel = XmCreateFileSelectionDialog(parentWidget,
-                                                 "file_selector", args, ac);
+                                                 wxMOTIF_STR("file_selector"),
+                                                 args, ac);
 #define wxFSChild( name ) \
     XmFileSelectionBoxGetChild(fileSel, name)
 
@@ -237,26 +231,26 @@ int wxFileDialog::ShowModal()
 
     if (!m_message.IsNull())
         XtVaSetValues(shell,
-                      XmNtitle, wxConstCast(m_message.c_str(), char),
+                      XmNtitle, (const char*)m_message.mb_str(),
                       NULL);
 
-    if (m_wildCard != "")
+    if (!m_wildCard.empty())
     {
         // return something understandable by Motif
         wxString wildCard = ParseWildCard( m_wildCard );
         wxString filter;
-        if (m_dir != "")
+        if (!m_dir.empty())
             filter = m_dir + wxString("/") + wildCard;
         else
             filter = wildCard;
 
-        XmTextSetString(filterWidget, wxConstCast(filter.c_str(), char));
+        XmTextSetString(filterWidget, filter.char_str());
         XmFileSelectionDoSearch(fileSel, NULL);
     }
 
     // Suggested by Terry Gitnick, 16/9/97, because of change in Motif
     // file selector on Solaris 1.5.1.
-    if ( m_dir != "" )
+    if ( !m_dir.empty() )
     {
         wxXmString thePath( m_dir );
 
@@ -265,9 +259,9 @@ int wxFileDialog::ShowModal()
             NULL);
     }
 
-    wxString entirePath("");
+    wxString entirePath;
 
-    if (m_dir != "")
+    if (!m_dir.empty())
     {
         entirePath = m_dir + wxString("/") + m_fileName;
     }
@@ -276,10 +270,9 @@ int wxFileDialog::ShowModal()
         entirePath = m_fileName;
     }
 
-    if (entirePath != "")
+    if (!entirePath.empty())
     {
-        XmTextSetString(selectionWidget,
-                        wxConstCast(entirePath.c_str(), char));
+        XmTextSetString(selectionWidget, entirePath.char_str());
     }
 
     XtAddCallback(fileSel, XmNcancelCallback,
@@ -312,7 +305,7 @@ int wxFileDialog::ShowModal()
 
     XtManageChild(fileSel);
 
-    m_fileSelectorAnswer = "";
+    m_fileSelectorAnswer = wxEmptyString;
     m_fileSelectorReturned = false;
 
     wxEndBusyCursor();
@@ -338,9 +331,8 @@ int wxFileDialog::ShowModal()
     m_fileName = wxFileNameFromPath(m_fileSelectorAnswer);
     m_dir = wxPathOnly(m_path);
 
-    if (m_fileName == "")
+    if (m_fileName.empty())
         return wxID_CANCEL;
     else
         return wxID_OK;
 }
-