Use the handy B_CLOSE_ON_ESCAPE flag instead of fishing for the escape key in
DispatchMessage(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32419 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -21,7 +21,9 @@ const uint32 MSG_FIND_HIDE = 'Fhid';
|
|||||||
|
|
||||||
FindWindow::FindWindow (BRect frame, BMessenger messenger , BString &str,
|
FindWindow::FindWindow (BRect frame, BMessenger messenger , BString &str,
|
||||||
bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
|
bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
|
||||||
: BWindow(frame, "Find", B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
|
:
|
||||||
|
BWindow(frame, "Find", B_FLOATING_WINDOW,
|
||||||
|
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE),
|
||||||
fFindDlgMessenger(messenger)
|
fFindDlgMessenger(messenger)
|
||||||
{
|
{
|
||||||
AddShortcut((ulong)'W', (ulong)B_COMMAND_KEY, new BMessage(MSG_FIND_HIDE));
|
AddShortcut((ulong)'W', (ulong)B_COMMAND_KEY, new BMessage(MSG_FIND_HIDE));
|
||||||
@@ -138,23 +140,6 @@ FindWindow::MessageReceived(BMessage *msg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
FindWindow::DispatchMessage(BMessage *message, BHandler *handler)
|
|
||||||
{
|
|
||||||
if (message->what == B_KEY_DOWN) {
|
|
||||||
int8 key;
|
|
||||||
if (message->FindInt8("byte", 0, &key) == B_OK) {
|
|
||||||
if (key == B_ESCAPE) {
|
|
||||||
message->MakeEmpty();
|
|
||||||
message->what = B_QUIT_REQUESTED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BWindow::DispatchMessage(message, handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
FindWindow::Quit()
|
FindWindow::Quit()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ class FindWindow : public BWindow {
|
|||||||
|
|
||||||
virtual void Quit();
|
virtual void Quit();
|
||||||
virtual void MessageReceived(BMessage *msg);
|
virtual void MessageReceived(BMessage *msg);
|
||||||
virtual void DispatchMessage(BMessage* message, BHandler* handler);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _SendFindMessage();
|
void _SendFindMessage();
|
||||||
|
|||||||
Reference in New Issue
Block a user