improved dialup manager, added wxALL_FILES define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,6 +16,12 @@
|
|||||||
#pragma interface "defs.h"
|
#pragma interface "defs.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
// needed to handle strings with xgettext:
|
||||||
|
#ifndef gettext_noop
|
||||||
|
# define gettext_noop(x) x
|
||||||
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// compiler and OS identification
|
// compiler and OS identification
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -1505,6 +1511,16 @@ typedef enum {
|
|||||||
wxPRINT_MODE_PRINTER = 3 // Send to printer
|
wxPRINT_MODE_PRINTER = 3 // Send to printer
|
||||||
} wxPrintMode;
|
} wxPrintMode;
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Macro to specify "All Files" on different platforms
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
#if defined(__WXMSW__)
|
||||||
|
# define wxALL_FILES_PATTERN "*.*"
|
||||||
|
# define wxALL_FILES gettext_noop("All files (*.*)|*.*")
|
||||||
|
#else
|
||||||
|
# define wxALL_FILES_PATTERN "*"
|
||||||
|
# define wxALL_FILES gettext_noop("All files (*)|*")
|
||||||
|
#endif
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// macros that enable wxWindows apps to be compiled in absence of the
|
// macros that enable wxWindows apps to be compiled in absence of the
|
||||||
// sytem headers, although some platform specific types are used in the
|
// sytem headers, although some platform specific types are used in the
|
||||||
|
@@ -478,7 +478,7 @@ class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
|
|||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
|
DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
|
||||||
public:
|
public:
|
||||||
wxFilenameListValidator(wxString message = "Select a file", wxString wildcard = "*.*", long flags = 0);
|
wxFilenameListValidator(wxString message = "Select a file", wxString wildcard = wxALL_FILES_PATTERN, long flags = 0);
|
||||||
|
|
||||||
~wxFilenameListValidator(void);
|
~wxFilenameListValidator(void);
|
||||||
|
|
||||||
|
@@ -32,6 +32,7 @@
|
|||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
#include "wx/wxchar.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
@@ -245,6 +246,12 @@ wxDialUpManagerImpl::wxDialUpManagerImpl()
|
|||||||
m_CanUseIfconfig = -1; // unknown
|
m_CanUseIfconfig = -1; // unknown
|
||||||
m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
|
m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
|
||||||
m_BeaconPort = 80;
|
m_BeaconPort = 80;
|
||||||
|
SetConnectCommand("pon", "poff"); // default values for Debian/GNU linux
|
||||||
|
wxChar * dial = wxGetenv(_T("WXDIALUP_DIALCMD"));
|
||||||
|
wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD"));
|
||||||
|
if(dial || hup)
|
||||||
|
SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,
|
||||||
|
hup ? wxString(hup) : m_HangUpCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxDialUpManagerImpl::~wxDialUpManagerImpl()
|
wxDialUpManagerImpl::~wxDialUpManagerImpl()
|
||||||
|
Reference in New Issue
Block a user