From bb14a500e681b281eabd62a94ffd4a84206fe31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Wed, 14 Jul 2004 22:52:48 +0000
Subject: [PATCH] small changes

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8399 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/prefs/keymap/KeymapWindow.cpp | 28 +++++++++++++++-------------
 src/prefs/keymap/KeymapWindow.h   |  5 ++---
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/prefs/keymap/KeymapWindow.cpp b/src/prefs/keymap/KeymapWindow.cpp
index e93115eb5e..9d832372a3 100644
--- a/src/prefs/keymap/KeymapWindow.cpp
+++ b/src/prefs/keymap/KeymapWindow.cpp
@@ -191,11 +191,10 @@ KeymapWindow::AddMaps(BView *placeholderView)
 	if( currentKeymapItem != NULL )
 		fUserListView->AddItem( currentKeymapItem );
 	// Saved keymaps
-	mapsBox->AddChild( new BScrollView( "systemScrollList", fUserListView,
+	mapsBox->AddChild( new BScrollView( "userScrollList", fUserListView,
 		B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true ));
 	fUserListView->SetSelectionMessage( new BMessage( USER_MAP_SELECTED ));
-	
-	
+		
 	FillSystemMaps();
 	
 	FillUserMaps();
@@ -350,6 +349,17 @@ MapView::MapView(BRect rect, const char *name, Keymap* keymap)
 		fCurrentFont(*be_plain_font),
 		fCurrentMap(keymap)
 {
+	BRect frameRect = BRect(14, 16, Bounds().right-12, 30);
+	BRect textRect = frameRect;
+	textRect.OffsetTo(B_ORIGIN);
+	textRect.InsetBy(1,1);
+	fTextView = new KeymapTextView(frameRect, "testzone", textRect,
+		B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS);
+	fTextView->MakeEditable(true);
+	fTextView->MakeSelectable(true);
+	
+	AddChild(fTextView);
+
 	BRect keyRect = BRect(11,50,29,68);
 	int32 i = 1;
 	fKeysRect[i] = keyRect;
@@ -705,16 +715,7 @@ MapView::MapView(BRect rect, const char *name, Keymap* keymap)
 		
 	fKeysVertical[0x5e] = true;
 	
-	BRect frameRect = BRect(14, 16, Bounds().right-12, 30);
-	BRect textRect = frameRect;
-	textRect.OffsetTo(B_ORIGIN);
-	textRect.InsetBy(1,1);
-	fTextView = new KeymapTextView(frameRect, "testzone", textRect,
-		B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS);
-	fTextView->MakeEditable(true);
-	fTextView->MakeSelectable(true);
-	fTextView->SetViewColor(255,255,255);
-	AddChild(fTextView);
+	
 	
 }
 
@@ -723,6 +724,7 @@ void
 MapView::AttachedToWindow()
 {
 	SetEventMask(B_KEYBOARD_EVENTS, B_NO_POINTER_HISTORY);
+	fTextView->SetViewColor(255,255,255);
 }
 
 
diff --git a/src/prefs/keymap/KeymapWindow.h b/src/prefs/keymap/KeymapWindow.h
index f1dc43e0cc..315cd490cc 100644
--- a/src/prefs/keymap/KeymapWindow.h
+++ b/src/prefs/keymap/KeymapWindow.h
@@ -16,9 +16,8 @@
 #ifndef KEYMAP_WINDOW_H
 #define KEYMAP_WINDOW_H
 
-#include <interface/Window.h>
-#include <support/List.h>
-#include <interface/MenuBar.h>
+#include <Window.h>
+#include <MenuBar.h>
 #include "KeymapTextView.h"
 #include "Keymap.h"