#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>
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
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;
+ if ( current == _("DEL") ) {
+ keyCode = WXK_DELETE;
}
- else if ( current == wxT("PGUP") ) {
+ 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 == wxT("PGDN") ) {
+ else if ( current == _("PGDN") ) {
keyCode = VK_NEXT;
}
+#endif
else
-#endif // 0
{
- wxLogDebug(wxT("Unrecognized accel key '%s', accel "
- "string ignored."), current.c_str());
+ wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
+ current.c_str());
}
}
}
return menuBar->FindMenuItem (menuString, itemString);
}
+// 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
/*
return wxYES;
case wxID_NO:
return wxNO;
- default:
case wxID_CANCEL:
return wxCANCEL;
}
+
+ wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+ return wxCANCEL;
}
#if wxUSE_TEXTDLG
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(0);
- 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((HWND) m_winTop, &reWin);
- SetWindowPos ((HWND) 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
+#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();
+
+ wxCHECK_MSG( es, -1, _T("stderr can't be NULL") );
+
+ tes = new wxTextInputStream(*es);
+ }
+
+ bool cont;
+ do
+ {
+ cont = FALSE;
- output.Add(line);
+ 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
+#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