#if wxUSE_GUI
#include "wx/window.h"
- #include "wx/menu.h"
#include "wx/frame.h"
+ #include "wx/menu.h"
#include "wx/msgdlg.h"
#include "wx/textdlg.h"
#if wxUSE_ACCEL
#endif // wxUSE_GUI
#endif // WX_PRECOMP
+#ifndef __WIN16__
#include "wx/process.h"
#include "wx/txtstrm.h"
+#endif
#include <ctype.h>
#include <stdio.h>
#if wxUSE_GUI
#include "wx/colordlg.h"
+ #include "wx/notebook.h"
+ #include "wx/frame.h"
+ #include "wx/statusbr.h"
+ #include "wx/toolbar.h"
#endif // wxUSE_GUI
#include <time.h>
}
#endif // __VMS__
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#ifndef __GNUWIN32__
#ifndef __MWERKS__
{
static wxChar buf[256];
-// sprintf (buf, "%.2f", number);
wxSprintf (buf, fmt, number);
return buf;
}
else
secondDigit = buf.GetChar(1) - wxT('0');
- return firstDigit * 16 + secondDigit;
+ return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
}
// Convert decimal integer to 2-character hex string
#if wxUSE_GUI
+#if wxUSE_MENUS
+
// ----------------------------------------------------------------------------
// Menu accelerators related functions
// ----------------------------------------------------------------------------
-wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
+wxChar *wxStripMenuCodes(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 {
-#if 0 // this is not supported by GTK+, apparently
- // several special cases
- current.MakeUpper();
- if ( current == wxT("DEL") ) {
- keyCode = VK_DELETE;
- }
- else if ( current == wxT("PGUP") ) {
- keyCode = VK_PRIOR;
- }
- else if ( current == wxT("PGDN") ) {
- keyCode = VK_NEXT;
- }
- else
-#endif // 0
- {
- 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'.
+// We go backwards, to try to allow for controls that are spacially
+// within other controls, but are still siblings (e.g. buttons within
+// static boxes). Static boxes are likely to be created _before_ controls
+// that sit inside them.
+wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
+{
+ if (!win->IsShown())
+ return NULL;
+
+ // Hack for wxNotebook case: at least in wxGTK, all pages
+ // claim to be shown, so we must only deal with the selected one.
+ if (win->IsKindOf(CLASSINFO(wxNotebook)))
+ {
+ wxNotebook* nb = (wxNotebook*) win;
+ int sel = nb->GetSelection();
+ if (sel >= 0)
+ {
+ wxWindow* child = nb->GetPage(sel);
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ }
+ }
+ /* Doesn't work
+ // Frame case
+ else if (win->IsKindOf(CLASSINFO(wxFrame)))
+ {
+ // Pseudo-children that may not be mentioned in the child list
+ wxWindowList extraChildren;
+ wxFrame* frame = (wxFrame*) win;
+ if (frame->GetStatusBar())
+ extraChildren.Append(frame->GetStatusBar());
+ if (frame->GetToolBar())
+ extraChildren.Append(frame->GetToolBar());
+
+ wxNode* node = extraChildren.First();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ node = node->Next();
+ }
+ }
+ */
+
+ wxNode* node = win->GetChildren().Last();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ node = node->Previous();
+ }
+
+ wxPoint pos = win->GetPosition();
+ wxSize sz = win->GetSize();
+ if (win->GetParent())
+ {
+ pos = win->GetParent()->ClientToScreen(pos);
+ }
+
+ wxRect rect(pos, sz);
+ if (rect.Inside(pt))
+ return win;
+ else
+ return NULL;
+}
+
+wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
+{
+ // Go backwards through the list since windows
+ // on top are likely to have been appended most
+ // recently.
+ wxNode* node = wxTopLevelWindows.Last();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* found = wxFindWindowAtPoint(win, pt);
+ if (found)
+ return found;
+ node = node->Previous();
+ }
+ return NULL;
}
#endif // wxUSE_GUI
* 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 wxYES;
case wxID_NO:
return wxNO;
- default:
case wxID_CANCEL:
return wxCANCEL;
}
+
+ wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+ 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)
// ----------------------------------------------------------------------------
wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
{
-#ifdef __WXMSW__
-#ifdef __WIN32__
- // and the top level window too
- HWND hwndFG = ::GetForegroundWindow();
- m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#else
- HWND hwndFG = ::GetTopWindow();
- m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#endif
-#endif // MSW
-
// remember the top level windows which were already disabled, so that we
// don't reenable them later
m_winDisabled = NULL;
}
delete m_winDisabled;
-
-#ifdef __WXMSW__
-#ifdef __WIN32__
- if ( m_winTop )
- {
- if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
- {
- wxLogLastError("SetForegroundWindow");
- }
- }
-#else
- if ( m_winTop )
- {
- // 16-bit SetForegroundWindow() replacement
- RECT reWin;
- GetWindowRect(m_winTop, &reWin);
- SetWindowPos (m_winTop, HWND_TOP,
- reWin.left, reWin.top,
- reWin.right - reWin.left, reWin.bottom,
- SWP_SHOWWINDOW);
- }
-#endif
-#endif // MSW
}
// Yield to other apps/messages and disable user input to all windows except
// the given one
bool wxSafeYield(wxWindow *win)
{
- wxWindowDisabler wd;
+ wxWindowDisabler wd(win);
bool rc = wxYield();
{
wxString email;
- wxString host = wxGetHostName();
+ wxString host = wxGetFullHostName();
if ( !!host )
{
wxString user = wxGetUserId();
if ( !!user )
{
- wxString email(user);
- email << wxT('@') << host;
+ email << user << wxT('@') << host;
}
}
// wxExecute
// ----------------------------------------------------------------------------
-long wxExecute(const wxString& command, wxArrayString& output)
+// this is a private function because it hasn't a clean interface: the first
+// array is passed by reference, the second by pointer - instead we have 2
+// public versions of wxExecute() below
+static long wxDoExecuteWithCapture(const wxString& command,
+ wxArrayString& output,
+ wxArrayString* error)
{
+#ifdef __WIN16__
+ wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
+
+ return 0;
+#else // !Win16
// create a wxProcess which will capture the output
wxProcess *process = new wxProcess;
process->Redirect();
long rc = wxExecute(command, TRUE /* sync */, process);
+
+#if wxUSE_STREAMS
if ( rc != -1 )
{
- wxInputStream& is = *process->GetInputStream();
- wxTextInputStream tis(is);
- while ( !is.Eof() && is.IsOk() )
+ wxInputStream* is = process->GetInputStream();
+ wxCHECK_MSG( is, -1, _T("if wxExecute() succeded, stream can't be NULL") );
+ wxTextInputStream tis(*is);
+
+ wxTextInputStream *tes = NULL;
+ wxInputStream *es = NULL;
+ if ( error )
{
- wxString line = tis.ReadLine();
- if ( is.LastError() )
- break;
+ es = process->GetErrorStream();
- output.Add(line);
+ wxCHECK_MSG( es, -1, _T("stderr can't be NULL") );
+
+ tes = new wxTextInputStream(*es);
}
+
+ bool cont;
+ do
+ {
+ cont = FALSE;
+
+ if ( !is->Eof() && is->IsOk() )
+ {
+ wxString line = tis.ReadLine();
+ if ( is->LastError() )
+ break;
+
+ cont = TRUE;
+
+ output.Add(line);
+ }
+
+ if ( error && !es->Eof() && es->IsOk() )
+ {
+ wxString line = tes->ReadLine();
+ if ( es->LastError() )
+ break;
+
+ cont = TRUE;
+
+ error->Add(line);
+ }
+ }
+ while ( cont );
+
+ delete tes;
}
+#endif // wxUSE_STREAMS
+
+ delete process;
return rc;
+#endif // IO redirection supoprted
}
+
+long wxExecute(const wxString& command, wxArrayString& output)
+{
+ return wxDoExecuteWithCapture(command, output, NULL);
+}
+
+long wxExecute(const wxString& command,
+ wxArrayString& output,
+ wxArrayString& error)
+{
+ return wxDoExecuteWithCapture(command, output, &error);
+}
+
+
projects / wxWidgets.git / blobdiff