1. added wxGTK::wxToolBar::SetToolShortHelp() and test for it in sample
2. fix a crash if SetSelection is called too early in wxTextCtrl 3. patch for mouse position in wxTreeCtrl events git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,12 +35,12 @@
|
||||
|
||||
// what to test (in alphabetic order)?
|
||||
|
||||
#define TEST_ARRAYS
|
||||
//#define TEST_ARRAYS
|
||||
//#define TEST_CMDLINE
|
||||
//#define TEST_DATETIME
|
||||
//#define TEST_DIR
|
||||
//#define TEST_DLLLOADER
|
||||
//#define TEST_EXECUTE
|
||||
#define TEST_EXECUTE
|
||||
//#define TEST_FILE
|
||||
//#define TEST_FILECONF
|
||||
//#define TEST_HASH
|
||||
@@ -49,7 +49,7 @@
|
||||
//#define TEST_LONGLONG
|
||||
//#define TEST_MIME
|
||||
//#define TEST_INFO_FUNCTIONS
|
||||
#define TEST_REGISTRY
|
||||
//#define TEST_REGISTRY
|
||||
//#define TEST_SOCKETS
|
||||
//#define TEST_STREAMS
|
||||
//#define TEST_STRINGS
|
||||
@@ -296,9 +296,9 @@ static void TestExecute()
|
||||
puts("*** testing wxExecute ***");
|
||||
|
||||
#ifdef __UNIX__
|
||||
#define COMMAND "echo hi"
|
||||
#define COMMAND "cat -n ../../Makefile" // "echo hi"
|
||||
#define SHELL_COMMAND "echo hi from shell"
|
||||
#define REDIRECT_COMMAND "date"
|
||||
#define REDIRECT_COMMAND COMMAND // "date"
|
||||
#elif defined(__WXMSW__)
|
||||
#define COMMAND "command.com -c 'echo hi'"
|
||||
#define SHELL_COMMAND "echo hi"
|
||||
|
@@ -175,8 +175,11 @@ private:
|
||||
void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
|
||||
{
|
||||
wxString msg;
|
||||
msg.Printf(_("pos=(%d, %d), size=%dx%d"),
|
||||
pos.x, pos.y, size.x, size.y);
|
||||
wxSize sizeCl = GetClientSize();
|
||||
msg.Printf(_("pos=(%d, %d), size=%dx%d (client=%dx%d)"),
|
||||
pos.x, pos.y,
|
||||
size.x, size.y,
|
||||
sizeCl.x, sizeCl.y);
|
||||
SetStatusText(msg, 1);
|
||||
}
|
||||
|
||||
|
@@ -109,6 +109,7 @@ public:
|
||||
void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); }
|
||||
void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); }
|
||||
void OnInsertPrint(wxCommandEvent& event);
|
||||
void OnChangeToolTip(wxCommandEvent& event);
|
||||
void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }
|
||||
|
||||
void OnToolLeftClick(wxCommandEvent& event);
|
||||
@@ -161,6 +162,7 @@ enum
|
||||
IDM_TOOLBAR_TOGGLEHELP,
|
||||
IDM_TOOLBAR_TOGGLEFULLSCREEN,
|
||||
IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
|
||||
IDM_TOOLBAR_CHANGE_TOOLTIP,
|
||||
|
||||
ID_COMBO = 1000
|
||||
};
|
||||
@@ -189,6 +191,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
|
||||
EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
|
||||
EVT_MENU(IDM_TOOLBAR_TOGGLEFULLSCREEN, MyFrame::OnToggleFullScreen)
|
||||
EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
|
||||
|
||||
EVT_MENU(-1, MyFrame::OnToolLeftClick)
|
||||
|
||||
@@ -378,11 +381,10 @@ MyFrame::MyFrame(wxFrame* parent,
|
||||
tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button\tCtrl-D", "");
|
||||
tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button\tCtrl-I", "");
|
||||
tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button\tCtrl-T", "");
|
||||
|
||||
#ifdef __WXMSW__
|
||||
tbarMenu->AppendSeparator();
|
||||
tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, "Change tool tip", "");
|
||||
tbarMenu->AppendSeparator();
|
||||
tbarMenu->Append(IDM_TOOLBAR_TOGGLEFULLSCREEN, "Toggle &full screen mode\tCtrl-F", "");
|
||||
#endif
|
||||
|
||||
wxMenu *fileMenu = new wxMenu;
|
||||
fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
|
||||
@@ -567,6 +569,11 @@ void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
|
||||
event.Enable( m_textWindow->CanCopy() );
|
||||
}
|
||||
|
||||
void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button"));
|
||||
}
|
||||
|
||||
void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxBitmap bmp = wxBITMAP(print);
|
||||
|
Reference in New Issue
Block a user