#include "wx/log.h"
#if wxUSE_GUI
+ #include "wx/app.h"
#include "wx/window.h"
- #include "wx/menu.h"
#include "wx/frame.h"
+ #include "wx/menu.h"
#include "wx/msgdlg.h"
#include "wx/textdlg.h"
+ #include "wx/textctrl.h" // for wxTE_PASSWORD
#if wxUSE_ACCEL
#include "wx/menuitem.h"
#include "wx/accel.h"
#if !defined(__WATCOMC__)
#if !(defined(_MSC_VER) && (_MSC_VER > 800))
- //
- // OS/2's App.h is being included first which includes nerrno.h
- // so these are already defined. Undef them if defined before
- // including errno.h
- //
- #ifdef EEXIST
- #undef EEXIST
- #endif
- #ifdef ENOENT
- #undef ENOENT
- #endif
- #ifdef EMFILE
- #undef EMFILE
- #endif
- #ifdef EINTR
- #undef EINTR
- #endif
- #ifdef EINVAL
- #undef EINVAL
- #endif
- #ifdef ENOMEM
- #undef ENOMEM
- #endif
- #ifdef EACCES
- #undef EACCES
- #endif
#include <errno.h>
#endif
#endif
// string functions
// ----------------------------------------------------------------------------
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)
int strcasecmp(const char *str_1, const char *str_2)
{
register char c1, c2;
return 0 ;
}
-#endif // wxMAC
+#endif // __WXMAC__ && !__DARWIN__
#if defined( __VMS__ ) && ( __VMS_VER < 70000000 )
// we have no strI functions under VMS, therefore I have implemented
}
#endif // __VMS__
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#ifndef __GNUWIN32__
#ifndef __MWERKS__
}
void
-StringToFloat (wxChar *s, float *number)
+StringToFloat (const wxChar *s, float *number)
{
if (s && *s && number)
*number = (float) wxStrtod (s, (wxChar **) NULL);
}
void
-StringToDouble (wxChar *s, double *number)
+StringToDouble (const wxChar *s, double *number)
{
if (s && *s && number)
*number = wxStrtod (s, (wxChar **) NULL);
{
static wxChar buf[256];
-// sprintf (buf, "%.2f", number);
wxSprintf (buf, fmt, number);
return buf;
}
}
void
-StringToInt (wxChar *s, int *number)
+StringToInt (const wxChar *s, int *number)
{
if (s && *s && number)
*number = (int) wxStrtol (s, (wxChar **) NULL, 10);
}
void
-StringToLong (wxChar *s, long *number)
+StringToLong (const wxChar *s, long *number)
{
if (s && *s && number)
*number = wxStrtol (s, (wxChar **) NULL, 10);
// Match a string INDEPENDENT OF CASE
bool
-StringMatch (char *str1, char *str2, bool subString, bool exact)
+StringMatch (const char *str1, const char *str2, bool subString, bool exact)
{
if (str1 == NULL || str2 == NULL)
return FALSE;
#if wxUSE_GUI
+#if wxUSE_MENUS
+
// ----------------------------------------------------------------------------
// Menu accelerators related functions
// ----------------------------------------------------------------------------
-wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
+wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
{
- if (!in)
- return (wxChar *) NULL;
-
- if (!out)
- out = copystring(in);
-
- wxChar *tmpOut = out;
-
- while (*in)
+ wxString s = wxMenuItem::GetLabelFromText(in);
+ if ( out )
{
- if (*in == wxT('&'))
- {
- // Check && -> &, &x -> x
- if (*++in == wxT('&'))
- *out++ = *in++;
- }
- else if (*in == wxT('\t'))
- {
- // Remove all stuff after \t in X mode, and let the stuff as is
- // in Windows mode.
- // Accelerators are handled in wx_item.cc for Motif, and are not
- // YET supported in XView
- break;
- }
- else
- *out++ = *in++;
- } // while
-
- *out = wxT('\0');
+ // go smash their buffer if it's not big enough - I love char * params
+ memcpy(out, s.c_str(), s.length() * sizeof(wxChar));
+ }
+ else
+ {
+ out = copystring(s);
+ }
- return tmpOut;
+ return out;
}
-wxString wxStripMenuCodes(const wxString& str)
+wxString wxStripMenuCodes(const wxString& in)
{
- wxChar *buf = new wxChar[str.Length() + 1];
- wxStripMenuCodes(WXSTRINGCAST str, buf);
- wxString str1(buf);
- delete[] buf;
- return str1;
-}
+ wxString out;
-#if wxUSE_ACCEL
+ size_t len = in.length();
+ out.reserve(len);
-// return wxAcceleratorEntry for the given menu string or NULL if none
-// specified
-wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
-{
- // check for accelerators: they are given after '\t'
- int posTab = label.Find(wxT('\t'));
- if ( posTab != wxNOT_FOUND ) {
- // parse the accelerator string
- int keyCode = 0;
- int accelFlags = wxACCEL_NORMAL;
- wxString current;
- for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) {
- if ( (label[n] == '+') || (label[n] == '-') ) {
- if ( current == _("ctrl") )
- accelFlags |= wxACCEL_CTRL;
- else if ( current == _("alt") )
- accelFlags |= wxACCEL_ALT;
- else if ( current == _("shift") )
- accelFlags |= wxACCEL_SHIFT;
- else {
- wxLogDebug(wxT("Unknown accel modifier: '%s'"),
- current.c_str());
- }
-
- current.Empty();
+ for ( size_t n = 0; n < len; n++ )
+ {
+ wxChar ch = in[n];
+ if ( ch == _T('&') )
+ {
+ // skip it, it is used to introduce the accel char (or to quote
+ // itself in which case it should still be skipped): note that it
+ // can't be the last character of the string
+ if ( ++n == len )
+ {
+ wxLogDebug(_T("Invalid menu string '%s'"), in.c_str());
}
- else {
- current += wxTolower(label[n]);
+ else
+ {
+ // use the next char instead
+ ch = in[n];
}
}
-
- if ( current.IsEmpty() ) {
- wxLogDebug(wxT("No accel key found, accel string ignored."));
- }
- else {
- if ( current.Len() == 1 ) {
- // it's a letter
- keyCode = wxToupper(current[0U]);
- }
- else {
- // is it a function key?
- if ( current[0U] == 'f' && isdigit(current[1U]) &&
- (current.Len() == 2 ||
- (current.Len() == 3 && isdigit(current[2U]))) ) {
- int n;
- wxSscanf(current.c_str() + 1, wxT("%d"), &n);
-
- keyCode = WXK_F1 + n - 1;
- }
- else {
- // several special cases
- current.MakeUpper();
- if ( current == _("DEL") ) {
- keyCode = WXK_DELETE;
- }
- else if ( current == _("DELETE") ) {
- keyCode = WXK_DELETE;
- }
- else if ( current == _("INS") ) {
- keyCode = WXK_INSERT;
- }
- else if ( current == _("INSERT") ) {
- keyCode = WXK_INSERT;
- }
-#if 0
- else if ( current == _("PGUP") ) {
- keyCode = VK_PRIOR;
- }
- else if ( current == _("PGDN") ) {
- keyCode = VK_NEXT;
- }
-#endif
- else
- {
- wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
- current.c_str());
- }
- }
- }
+ else if ( ch == _T('\t') )
+ {
+ // everything after TAB is accel string, exit the loop
+ break;
}
- if ( keyCode ) {
- // we do have something
- return new wxAcceleratorEntry(accelFlags, keyCode);
- }
+ out += ch;
}
- return (wxAcceleratorEntry *)NULL;
+ return out;
}
-#endif // wxUSE_ACCEL
+#endif // wxUSE_MENUS
// ----------------------------------------------------------------------------
// Window search functions
int
wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
{
+#if wxUSE_MENUS
wxMenuBar *menuBar = frame->GetMenuBar ();
- if (!menuBar)
- return -1;
- return menuBar->FindMenuItem (menuString, itemString);
+ if ( menuBar )
+ return menuBar->FindMenuItem (menuString, itemString);
+#endif // wxUSE_MENUS
+
+ return -1;
}
// Try to find the deepest child that contains 'pt'.
* since otherwise the generic code may be pulled in unnecessarily.
*/
+#if wxUSE_MSGDLG
+
int wxMessageBox(const wxString& message, const wxString& caption, long style,
wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
{
return wxCANCEL;
}
+#endif // wxUSE_MSGDLG
+
#if wxUSE_TEXTDLG
+
wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
const wxString& defaultValue, wxWindow *parent,
int x, int y, bool WXUNUSED(centre) )
#endif // wxUSE_TEXTDLG
+#if wxUSE_COLOURDLG
+
wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
{
wxColourData data;
return colRet;
}
+#endif // wxUSE_COLOURDLG
+
// ----------------------------------------------------------------------------
// missing C RTL functions (FIXME shouldn't be here at all)
// ----------------------------------------------------------------------------
#endif // wxUSE_GUI
+const wxChar *wxGetInstallPrefix()
+{
+ wxString prefix;
+
+ if ( wxGetEnv(wxT("WX_PREFIX"), &prefix) )
+ return prefix.c_str();
+
+#ifdef wxINSTALL_PREFIX
+ return wxT(wxINSTALL_PREFIX);
+#else
+ return wxT("");
+#endif
+}
+
+
// ----------------------------------------------------------------------------
// network and user id functions
// ----------------------------------------------------------------------------
{
return wxDoExecuteWithCapture(command, output, &error);
}
+
+// ----------------------------------------------------------------------------
+// wxApp::Yield() wrappers for backwards compatibility
+// ----------------------------------------------------------------------------
+
+bool wxYield()
+{
+#if wxUSE_GUI
+ return wxTheApp && wxTheApp->Yield();
+#else
+ return FALSE;
+#endif
+}
+
+bool wxYieldIfNeeded()
+{
+#if wxUSE_GUI
+ return wxTheApp && wxTheApp->Yield(TRUE);
+#else
+ return FALSE;
+#endif
+}
+
projects / wxWidgets.git / blobdiff