Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the wxSTC gets the focus when clicked.

Browse Source 
#if'd out my wxPopupWindow meanderings and just use a simple wxListBox
for the AutoComplete window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-07-10 21:12:03 +00:00
parent e0e2509c85
commit cb1871cabf
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/stc/PlatWX.cpp
View File

@@ -637,7 +637,7 @@ void Window::SetCursor(Cursor curs) {
#else #else
wxCursor wc = wxCursor(cursorId) ; wxCursor wc = wxCursor(cursorId) ;
#endif #endif
GETWIN(id)->SetCursor(wc); GETWIN(id)->SetCursor(wc);
} }
@@ -650,7 +650,7 @@ void Window::SetTitle(const char *s) {
// Helper classes for ListBox // Helper classes for ListBox
#if defined(__WXMAC__) #if 1 // defined(__WXMAC__)
class wxSTCListBoxWin : public wxListBox { class wxSTCListBoxWin : public wxListBox {
public: public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id) wxSTCListBoxWin(wxWindow* parent, wxWindowID id)

1
contrib/src/stc/stc.cpp
View File

@@ -1877,6 +1877,7 @@ void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
} }
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) { void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
SetFocus();
wxPoint pt = evt.GetPosition(); wxPoint pt = evt.GetPosition();
m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
evt.ShiftDown(), evt.ControlDown(), evt.AltDown()); evt.ShiftDown(), evt.ControlDown(), evt.AltDown());

1
contrib/src/stc/stc.cpp.in
View File

@@ -330,6 +330,7 @@ void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
} }
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) { void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
SetFocus();
wxPoint pt = evt.GetPosition(); wxPoint pt = evt.GetPosition();
m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
evt.ShiftDown(), evt.ControlDown(), evt.AltDown()); evt.ShiftDown(), evt.ControlDown(), evt.AltDown());

4
src/stc/PlatWX.cpp
View File

@@ -637,7 +637,7 @@ void Window::SetCursor(Cursor curs) {
#else #else
wxCursor wc = wxCursor(cursorId) ; wxCursor wc = wxCursor(cursorId) ;
#endif #endif
GETWIN(id)->SetCursor(wc); GETWIN(id)->SetCursor(wc);
} }
@@ -650,7 +650,7 @@ void Window::SetTitle(const char *s) {
// Helper classes for ListBox // Helper classes for ListBox
#if defined(__WXMAC__) #if 1 // defined(__WXMAC__)
class wxSTCListBoxWin : public wxListBox { class wxSTCListBoxWin : public wxListBox {
public: public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id) wxSTCListBoxWin(wxWindow* parent, wxWindowID id)

1
src/stc/stc.cpp
View File

@@ -1877,6 +1877,7 @@ void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
} }
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) { void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
SetFocus();
wxPoint pt = evt.GetPosition(); wxPoint pt = evt.GetPosition();
m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
evt.ShiftDown(), evt.ControlDown(), evt.AltDown()); evt.ShiftDown(), evt.ControlDown(), evt.AltDown());

1
src/stc/stc.cpp.in
View File

@@ -330,6 +330,7 @@ void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
} }
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) { void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
SetFocus();
wxPoint pt = evt.GetPosition(); wxPoint pt = evt.GetPosition();
m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
evt.ShiftDown(), evt.ControlDown(), evt.AltDown()); evt.ShiftDown(), evt.ControlDown(), evt.AltDown());