e015d1f7da
Benjamin I. Williams This patch implements three new flags for the wxTextCtrl control. The flags are wxTE_LEFT, wxTE_CENTRE, and wxTE_RIGHT. These flags can change the way text is aligned inside an edit control, which is useful when the user is editing numbers or dates. At Vadim's recommendation, the patch implements the alignment flags so they are equal to the corresponding wxALIGN_* value. wxTE_LEFT is actually 0x0000, and is just a place holder. wxTE_CENTRE is equal to wx_ALIGN_CENTER_HORIZONTAL (0x0100), and wxTE_RIGHT is equal to wxALIGN_RIGHT (0x0100). I couldn't agree more with this idea. As Vadim pointed out, choosing to set the text alignment flags to the corresponding wxALIGN_* flags has a slight negative side effect: the values 0x0100 and 0x0200 collide with the existing flags wxTE_NO_VSCROLL and wxTE_AUTO_SCROLL. A valid point was raised, however, which stated that the flags would never really be used at the same time, and also that wxTE_AUTO_SCROLL is (possibly) going to be deprecated anyway. While this collision is not really a problem, I didn't like the idea of someone specifying wxTE_NO_VSCROLL and ending up with with a centered text control ! Thus, I chose to move both wxTE_NO_VSCROLL and wxTE_AUTO_SCROLL down to the free bits 0x0002 and 0x0008, respectively. I'll leave the final say up to Vadim and the rest of you whether you want to move these flags down or keep them where they are (with collisions). What truly matters to me is that I can now create text controls with the proper alignment! This patch also updates the documentation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
171 lines
3.5 KiB
C++
171 lines
3.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: tbtest.cpp
|
|
// Purpose: wxTaskBarIcon demo
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c)
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/wx.h"
|
|
#endif
|
|
|
|
#include "wx/taskbar.h"
|
|
#include "tbtest.h"
|
|
|
|
// Declare two frames
|
|
MyDialog *dialog = NULL;
|
|
|
|
IMPLEMENT_APP(MyApp)
|
|
|
|
bool MyApp::OnInit(void)
|
|
{
|
|
wxIcon icon(wxT("mondrian_icon"));
|
|
|
|
if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
|
|
wxMessageBox(wxT("Could not set icon."));
|
|
|
|
// Create the main frame window
|
|
dialog = new MyDialog(NULL, -1, wxT("wxTaskBarIcon Test Dialog"), wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
|
|
|
|
dialog->Show(TRUE);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
BEGIN_EVENT_TABLE(MyDialog, wxDialog)
|
|
EVT_BUTTON(wxID_OK, MyDialog::OnOK)
|
|
EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)
|
|
EVT_CLOSE(MyDialog::OnCloseWindow)
|
|
END_EVENT_TABLE()
|
|
|
|
|
|
|
|
MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
|
|
const wxPoint& pos, const wxSize& size, const long windowStyle):
|
|
wxDialog(parent, id, title, pos, size, windowStyle)
|
|
{
|
|
Init();
|
|
}
|
|
|
|
void MyDialog::OnOK(wxCommandEvent& event)
|
|
{
|
|
Show(FALSE);
|
|
}
|
|
|
|
void MyDialog::OnExit(wxCommandEvent& event)
|
|
{
|
|
Close(TRUE);
|
|
}
|
|
|
|
void MyDialog::OnCloseWindow(wxCloseEvent& event)
|
|
{
|
|
Destroy();
|
|
}
|
|
|
|
void MyDialog::Init(void)
|
|
{
|
|
(void)new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
|
|
wxPoint(10, 20));
|
|
|
|
(void)new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
|
|
wxPoint(10, 40));
|
|
|
|
(void)new wxButton(this, wxID_EXIT, "Exit", wxPoint(185, 230), wxSize(80, 25));
|
|
(new wxButton(this, wxID_OK, "OK", wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
|
|
Centre(wxBOTH);
|
|
}
|
|
|
|
|
|
enum {
|
|
PU_RESTORE = 10001,
|
|
PU_NEW_ICON,
|
|
PU_EXIT,
|
|
};
|
|
|
|
|
|
BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
|
|
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
|
|
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
|
|
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
|
|
END_EVENT_TABLE()
|
|
|
|
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
|
|
{
|
|
dialog->Show(TRUE);
|
|
}
|
|
|
|
void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
|
|
{
|
|
dialog->Close(TRUE);
|
|
|
|
// Nudge wxWindows into destroying the dialog, since
|
|
// with a hidden window no messages will get sent to put
|
|
// it into idle processing.
|
|
wxGetApp().ProcessIdle();
|
|
}
|
|
|
|
void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
|
|
{
|
|
#ifdef __WXMSW__
|
|
wxIcon icon(wxT("wxDEFAULT_FRAME"));
|
|
|
|
if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
|
|
wxMessageBox(wxT("Could not set new icon."));
|
|
#endif
|
|
}
|
|
|
|
// Overridables
|
|
void MyTaskBarIcon::OnMouseMove(wxEvent&)
|
|
{
|
|
}
|
|
|
|
void MyTaskBarIcon::OnLButtonDown(wxEvent&)
|
|
{
|
|
}
|
|
|
|
void MyTaskBarIcon::OnLButtonUp(wxEvent&)
|
|
{
|
|
}
|
|
|
|
void MyTaskBarIcon::OnRButtonDown(wxEvent&)
|
|
{
|
|
}
|
|
|
|
void MyTaskBarIcon::OnRButtonUp(wxEvent&)
|
|
{
|
|
wxMenu menu;
|
|
|
|
menu.Append(PU_RESTORE, "&Restore TBTest");
|
|
#ifdef __WXMSW__
|
|
menu.Append(PU_NEW_ICON,"&Set New Icon");
|
|
#endif
|
|
menu.Append(PU_EXIT, "E&xit");
|
|
|
|
PopupMenu(&menu);
|
|
}
|
|
|
|
void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
|
|
{
|
|
dialog->Show(TRUE);
|
|
}
|
|
|
|
void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
|
|
{
|
|
}
|
|
|
|
|
|
|
|
|