Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use generic dialogs under Palm (generic.diff part of patch 1894861)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-02 01:20:08 +00:00
parent fcb9fb91ff
commit a85ad1db05
6 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/filedlg.h
View File

@@ -202,6 +202,9 @@ wxSaveFileSelector(const wxString& what,
#include "wx/cocoa/filedlg.h" #include "wx/cocoa/filedlg.h"
#elif defined(__WXPM__) #elif defined(__WXPM__)
#include "wx/os2/filedlg.h" #include "wx/os2/filedlg.h"
#elif defined(__WXPALMOS__)
#define wxHAS_GENERIC_FILEDIALOG
#include "wx/generic/filedlgg.h"
#endif #endif
#endif // wxUSE_FILEDLG #endif // wxUSE_FILEDLG

2
include/wx/treectrl.h
View File

@@ -435,7 +435,7 @@ protected:
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)
#include "wx/generic/treectlg.h" #include "wx/generic/treectlg.h"
#elif defined(__WXPALMOS__) #elif defined(__WXPALMOS__)
#include "wx/palmos/treectrl.h" #include "wx/generic/treectlg.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/treectrl.h" #include "wx/msw/treectrl.h"
#elif defined(__WXMOTIF__) #elif defined(__WXMOTIF__)

2
src/generic/dirctrlg.cpp
View File

@@ -251,7 +251,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
} }
} }
#elif defined(__UNIX__) #elif defined(__UNIX__) || defined(__WXPALMOS__)
paths.Add(wxT("/")); paths.Add(wxT("/"));
names.Add(wxT("/")); names.Add(wxT("/"));
icon_ids.Add(wxFileIconsTable::computer); icon_ids.Add(wxFileIconsTable::computer);

1
src/generic/dirdlgg.cpp
View File

@@ -33,6 +33,7 @@
#include "wx/dirctrl.h" #include "wx/dirctrl.h"
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/menu.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants

8
src/generic/filectrlg.cpp
View File

@@ -1178,9 +1178,11 @@ bool wxGenericFileCtrl::SetFilename( const wxString& name )
void wxGenericFileCtrl::DoSetFilterIndex( int filterindex ) void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
{ {
const wxString& str = (wx_static_cast(wxStringClientData *, wxClientData *pcd = m_choice->GetClientObject( filterindex );
m_choice->GetClientObject( filterindex ))) if ( !pcd )
->GetData(); return;
const wxString& str = ((wx_static_cast(wxStringClientData *, pcd))->GetData());
m_list->SetWild( str ); m_list->SetWild( str );
m_filterIndex = filterindex; m_filterIndex = filterindex;
if ( str.Left( 2 ) == wxT( "*." ) ) if ( str.Left( 2 ) == wxT( "*." ) )

7
src/generic/filedlgg.cpp
View File

@@ -19,7 +19,7 @@
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
// NOTE : it probably also supports MAC, untested // NOTE : it probably also supports MAC, untested
#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) && !defined(__PALMOS__)
#error wxGenericFileDialog currently only supports Unix, win32 and DOS #error wxGenericFileDialog currently only supports Unix, win32 and DOS
#endif #endif
@@ -53,7 +53,11 @@
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
#include "wx/tooltip.h" #include "wx/tooltip.h"
#endif #endif
#if wxUSE_CONFIG
#include "wx/config.h"
#endif
#ifndef __WXPALMOS5__
#ifndef __WXWINCE__ #ifndef __WXWINCE__
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -82,6 +86,7 @@
#if defined(__UNIX__) || defined(__DOS__) #if defined(__UNIX__) || defined(__DOS__)
#include <unistd.h> #include <unistd.h>
#endif #endif
#endif // ! __WXPALMOS5__
#if defined(__WXWINCE__) #if defined(__WXWINCE__)
#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))