#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
// Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff
+// #pragma interface/implementation correctly, iff
// #pragma implementation is used in _two_ translation
// units (as created by e.g. event.cpp compiled for
// libwx_base and event.cpp compiled for libwx_gui_core).
#include <sys/stat.h>
#endif
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
#include "wx/msw/private.h"
#endif
#endif
}
+void wxUsleep(unsigned long milliseconds)
+{
+ wxMilliSleep(milliseconds);
+}
+
const wxChar *wxGetInstallPrefix()
{
wxString prefix;
wxString wxGetDataDir()
{
- wxString format = wxGetInstallPrefix();
- format << wxFILE_SEP_PATH
- << wxT("share") << wxFILE_SEP_PATH
- << wxT("wx") << wxFILE_SEP_PATH
- << wxT("%i.%i");
- wxString dir;
- dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+ wxString dir = wxGetInstallPrefix();
+ dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
return dir;
}
{
wxString email = wxGetEmailAddress();
if ( !email )
- return FALSE;
+ return false;
wxStrncpy(address, email, maxSize - 1);
address[maxSize - 1] = wxT('\0');
- return TRUE;
+ return true;
}
wxString wxGetEmailAddress()
wxString email;
wxString host = wxGetFullHostName();
- if ( !!host )
+ if ( !host.empty() )
{
wxString user = wxGetUserId();
- if ( !!user )
+ if ( !user.empty() )
{
email << user << wxT('@') << host;
}
// wxDoExecuteWithCapture() helper: reads an entire stream into one array
//
-// returns TRUE if ok, FALSE if error
+// returns true if ok, false if error
#if wxUSE_STREAMS
static bool ReadAll(wxInputStream *is, wxArrayString& output)
{
- wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") );
+ wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") );
// the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
is->Reset();
wxTextInputStream tis(*is);
- bool cont = TRUE;
+ bool cont = true;
while ( cont )
{
wxString line = tis.ReadLine();
if ( !*is )
{
- cont = FALSE;
+ cont = false;
}
else
{
// public versions of wxExecute() below
static long wxDoExecuteWithCapture(const wxString& command,
wxArrayString& output,
- wxArrayString* error)
+ wxArrayString* error,
+ int flags)
{
// create a wxProcess which will capture the output
wxProcess *process = new wxProcess;
process->Redirect();
- long rc = wxExecute(command, wxEXEC_SYNC, process);
+ long rc = wxExecute(command, wxEXEC_SYNC | flags, process);
#if wxUSE_STREAMS
if ( rc != -1 )
}
}
-#endif // wxUSE_STREAMS
+#else
+ wxUnusedVar(output);
+ wxUnusedVar(error);
+#endif // wxUSE_STREAMS/!wxUSE_STREAMS
delete process;
return rc;
}
-long wxExecute(const wxString& command, wxArrayString& output)
+long wxExecute(const wxString& command, wxArrayString& output, int flags)
{
- return wxDoExecuteWithCapture(command, output, NULL);
+ return wxDoExecuteWithCapture(command, output, NULL, flags);
}
long wxExecute(const wxString& command,
wxArrayString& output,
- wxArrayString& error)
+ wxArrayString& error,
+ int flags)
{
- return wxDoExecuteWithCapture(command, output, &error);
+ return wxDoExecuteWithCapture(command, output, &error, flags);
}
// ----------------------------------------------------------------------------
bool wxYieldIfNeeded()
{
- return wxTheApp && wxTheApp->Yield(TRUE);
+ return wxTheApp && wxTheApp->Yield(true);
}
#endif // wxUSE_BASE
// Id generation
static long wxCurrentId = 100;
-long
-wxNewId (void)
+long wxNewId()
{
- return wxCurrentId++;
+ // skip the part of IDs space that contains hard-coded values:
+ if (wxCurrentId == wxID_LOWEST)
+ wxCurrentId = wxID_HIGHEST + 1;
+
+ return wxCurrentId++;
}
long
return wxWindow::FindWindowByName( name, parent );
}
-// Returns menu item id or -1 if none.
+// Returns menu item id or wxNOT_FOUND if none.
int
wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
{
return menuBar->FindMenuItem (menuString, itemString);
#endif // wxUSE_MENUS
- return -1;
+ return wxNOT_FOUND;
}
// Try to find the deepest child that contains 'pt'.
wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
const wxString& defaultValue, wxWindow *parent,
- int x, int y, bool WXUNUSED(centre) )
+ wxCoord x, wxCoord y, bool centre )
{
wxString str;
- wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
+ long style = wxTextEntryDialogStyle;
+
+ if (centre)
+ style |= wxCENTRE;
+ else
+ style &= ~wxCENTRE;
+
+ wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
if (dialog.ShowModal() == wxID_OK)
{
str = dialog.GetValue();
wxString wxGetPasswordFromUser(const wxString& message,
const wxString& caption,
const wxString& defaultValue,
- wxWindow *parent)
+ wxWindow *parent,
+ wxCoord x, wxCoord y, bool centre )
{
wxString str;
- wxTextEntryDialog dialog(parent, message, caption, defaultValue,
- wxOK | wxCANCEL | wxTE_PASSWORD);
+ long style = wxTextEntryDialogStyle;
+
+ if (centre)
+ style |= wxCENTRE;
+ else
+ style &= ~wxCENTRE;
+
+ wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
+ style, wxPoint(x, y));
if ( dialog.ShowModal() == wxID_OK )
{
str = dialog.GetValue();
wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
{
wxColourData data;
- data.SetChooseFull(TRUE);
+ data.SetChooseFull(true);
if ( colInit.Ok() )
{
data.SetColour((wxColour &)colInit); // const_cast
#ifndef __WXGTK__
bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
{
- return TRUE; // detectable auto-repeat is the only mode MSW supports
+ return true; // detectable auto-repeat is the only mode MSW supports
}
#endif // !wxGTK
projects / wxWidgets.git / blobdiff