1. panels pass focus to the next item in parent panel
2. warnings removed from iniconf.cpp and it's removed for Win32 compilation 3. wxWindow::PopupMenu(wxPoint) added, documented 4. Docs for wxTextCtrl explicitly mention that EVT_TEXT is triggered by programmatic updates too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -629,7 +629,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
|
||||
{ return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); }
|
||||
wxColour GetForegroundColour() const
|
||||
{ return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); }
|
||||
bool PopupMenu( wxMenu *menu, int x, int y )
|
||||
bool DoPopupMenu( wxMenu *menu, int x, int y )
|
||||
{ return m_mainWin->PopupMenu( menu, x, y ); }
|
||||
void SetFocus()
|
||||
{ m_mainWin->SetFocus(); }
|
||||
|
@@ -86,7 +86,7 @@ public:
|
||||
const wxFont *theFont = (const wxFont *) NULL)
|
||||
const;
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = TRUE );
|
||||
|
@@ -86,7 +86,7 @@ public:
|
||||
const wxFont *theFont = (const wxFont *) NULL)
|
||||
const;
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = TRUE );
|
||||
|
@@ -110,7 +110,7 @@ public:
|
||||
const wxFont *theFont = (const wxFont *) NULL)
|
||||
const;
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = TRUE );
|
||||
|
@@ -531,7 +531,10 @@ public:
|
||||
|
||||
void UpdateWindowUI();
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y ) = 0;
|
||||
bool PopupMenu( wxMenu *menu, const wxPoint& pos )
|
||||
{ return DoPopupMenu(menu, pos.x, pos.y); }
|
||||
bool PopupMenu( wxMenu *menu, int x, int y )
|
||||
{ return DoPopupMenu(menu, x, y); }
|
||||
|
||||
// scrollbars
|
||||
// ----------
|
||||
@@ -772,6 +775,8 @@ protected:
|
||||
virtual void DoSetToolTip( wxToolTip *tip );
|
||||
#endif // wxUSE_TOOLTIPS
|
||||
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0;
|
||||
|
||||
private:
|
||||
// contains the last id generated by NewControlId
|
||||
static int ms_lastControlId;
|
||||
|
Reference in New Issue
Block a user