--- a/src/cocoaui/cocoaui.h	Wed Jun 24 06:06:40 2009 +0000
+++ b/src/cocoaui/cocoaui.h	Sun Jan 31 18:36:06 2010 +1000
@@ -21,6 +21,7 @@
 
 #import <AppKit/AppKit.h>
 #include "lxdream.h"
+#include "config.h"
 #include "gui.h"
 #include "gettext.h"
 
@@ -75,6 +76,7 @@
     int headerHeight;
 }
 - (id)initWithFrame: (NSRect)frameRect title:(NSString *)title;
+- (id)initWithFrame: (NSRect)frameRect title:(NSString *)title configGroup: (lxdream_config_group_t)group scrollable: (BOOL)scroll;
 - (int)contentHeight;
 @end
 
@@ -90,12 +92,27 @@
 }
 @end
 
+
+@interface ConfigurationView : NSView
+{
+    lxdream_config_group_t group;
+    int labelWidth;
+    NSTextField *fields[CONFIG_MAX_KEYS][2];
+}
+- (id)initWithFrame: (NSRect)frameRect;
+- (id)initWithFrame: (NSRect)frameRect configGroup: (lxdream_config_group_t)group;
+- (void)setLabelWidth: (int)width;
+- (void)setConfigGroup: (lxdream_config_group_t)group;
+- (void)setDevice: (struct maple_device *)device;
+@end
+
+
 @interface LxdreamPrefsPanel : NSPanel
 {
     NSArray *toolbar_ids;
     NSArray *toolbar_defaults;
+    NSView *config_panes[3];
     NSDictionary *toolbar_items;
-    NSView *path_pane, *ctrl_pane;
     KeyBindingEditor *binding_editor;
 }
 - (id)initWithContentRect:(NSRect)contentRect;
@@ -107,11 +124,10 @@
 NSView *video_osx_create_drawable();
 void cocoa_gui_show_preferences();
 NSView *cocoa_gui_create_prefs_controller_pane();
-NSView *cocoa_gui_create_prefs_path_pane();
 
 
 #ifdef __cplusplus
 }
 #endif
     
-#endif /* lxdream_cocoaui_H */
\ No newline at end of file
+#endif /* lxdream_cocoaui_H */