aboutsummaryrefslogtreecommitdiffstats
path: root/win/rfb_win32/Dialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'win/rfb_win32/Dialog.h')
-rw-r--r--win/rfb_win32/Dialog.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/win/rfb_win32/Dialog.h b/win/rfb_win32/Dialog.h
index 35abb990..582aa0d9 100644
--- a/win/rfb_win32/Dialog.h
+++ b/win/rfb_win32/Dialog.h
@@ -28,7 +28,8 @@
#include <windows.h>
#include <prsht.h>
#include <list>
-#include <rfb_win32/TCharArray.h>
+
+#include <rfb/util.h>
namespace rfb {
@@ -51,7 +52,7 @@ namespace rfb {
// expansion), and owner is an optional window handle - the corresponding
// window is disabled while the dialog box is displayed.
- bool showDialog(const TCHAR* resource, HWND owner=0);
+ bool showDialog(const char* resource, HWND owner=0);
// initDialog() is called upon receipt of the WM_INITDIALOG message.
@@ -76,12 +77,12 @@ namespace rfb {
// Read the states of items
bool isItemChecked(int id);
int getItemInt(int id);
- TCHAR* getItemString(int id); // Recipient owns string storage
+ char* getItemString(int id); // Recipient owns string storage
// Set the states of items
void setItemChecked(int id, bool state);
void setItemInt(int id, int value);
- void setItemString(int id, const TCHAR* s);
+ void setItemString(int id, const char* s);
// enableItem is used to grey out an item, making it inaccessible, or to
// re-enable it.
@@ -105,7 +106,7 @@ namespace rfb {
class PropSheet {
public:
- PropSheet(HINSTANCE inst, const TCHAR* title, std::list<PropSheetPage*> pages, HICON icon=0);
+ PropSheet(HINSTANCE inst, const char* title, std::list<PropSheetPage*> pages, HICON icon=0);
virtual ~PropSheet();
// Display the PropertySheet
@@ -130,14 +131,14 @@ namespace rfb {
HICON icon;
std::list<PropSheetPage*> pages;
HINSTANCE inst;
- TCharArray title;
+ CharArray title;
HWND handle;
bool alreadyShowing;
};
class PropSheetPage : public Dialog {
public:
- PropSheetPage(HINSTANCE inst, const TCHAR* id);
+ PropSheetPage(HINSTANCE inst, const char* id);
virtual ~PropSheetPage();
void setChanged(bool changed);