i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the R5 StyledEdit build -- removed B_BAD_DATA as it was defined in Errors.h, unbeknownst to me

Browse Source 
Added Alt+W shortcuts to the Find and Replace windows in StyledEdit
Fixed the Escape key shortcut hack


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18445 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2006-08-07 18:24:18 +00:00
parent a68dd7c24a
commit eef409055a
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/HaikuBuildCompatibility.h
-1
View File
@@ -54,7 +54,6 @@ extern float roundf(float value);
#endif // HAIKU_TARGET_PLATFORM_HAIKU #endif // HAIKU_TARGET_PLATFORM_HAIKU
#ifdef HAIKU_TARGET_PLATFORM_BEOS #ifdef HAIKU_TARGET_PLATFORM_BEOS
# define B_BAD_DATA (B_NOT_ALLOWED+1)
# define B_REDO 'REDO' # define B_REDO 'REDO'
#endif #endif
src/apps/stylededit/FindWindow.cpp
+2
View File
@@ -23,6 +23,8 @@ FindWindow::FindWindow(BRect frame, BHandler *_handler, BString *searchString,
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED));
fFindView = new BView(Bounds(), "FindView", B_FOLLOW_ALL, B_WILL_DRAW); fFindView = new BView(Bounds(), "FindView", B_FOLLOW_ALL, B_WILL_DRAW);
fFindView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); fFindView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
AddChild(fFindView); AddChild(fFindView);
src/apps/stylededit/ReplaceWindow.cpp
+8
View File
@@ -11,6 +11,7 @@
#include "Constants.h" #include "Constants.h"
#include "ReplaceWindow.h" #include "ReplaceWindow.h"
#include <Messenger.h>
#include <Button.h> #include <Button.h>
#include <CheckBox.h> #include <CheckBox.h>
#include <String.h> #include <String.h>
@@ -24,6 +25,8 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler *_handler, BString *searchStr
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED));
fReplaceView = new BView(Bounds(), "ReplaceView", B_FOLLOW_ALL, B_WILL_DRAW); fReplaceView = new BView(Bounds(), "ReplaceView", B_FOLLOW_ALL, B_WILL_DRAW);
fReplaceView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); fReplaceView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
AddChild(fReplaceView); AddChild(fReplaceView);
@@ -133,6 +136,11 @@ ReplaceWindow::DispatchMessage(BMessage *message, BHandler *handler)
if (key == B_ESCAPE) { if (key == B_ESCAPE) {
message->MakeEmpty(); message->MakeEmpty();
message->what = B_QUIT_REQUESTED; message->what = B_QUIT_REQUESTED;
// This is a hack, but it actually does what is expected,
// unlike the hack above. This kind of key filtering probably
// ought to be handled by a BMessageFilter, though.
BMessenger (this).SendMessage(B_QUIT_REQUESTED);
} }
} }
} }