Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A few Unicode fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-10 18:12:13 +00:00
parent 093ac02981
commit 32c1cda244
25 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/app.h
View File

@@ -113,7 +113,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
public: public:
int argc; int argc;
char ** argv; wxChar ** argv;
protected: protected:
bool m_wantDebugOutput ; bool m_wantDebugOutput ;

2
include/wx/msw/bmpbuttn.h
View File

@@ -18,7 +18,7 @@
#include "wx/button.h" #include "wx/button.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4

2
include/wx/msw/button.h
View File

@@ -19,7 +19,7 @@
#include "wx/control.h" #include "wx/control.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
// Pushbutton // Pushbutton
class WXDLLEXPORT wxButton : public wxControl class WXDLLEXPORT wxButton : public wxControl

2
include/wx/msw/checkbox.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;

2
include/wx/msw/choice.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
// Choice item // Choice item
class WXDLLEXPORT wxChoice: public wxControl class WXDLLEXPORT wxChoice: public wxControl

4
include/wx/msw/clipbrd.h
View File

@@ -45,9 +45,9 @@ WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
// clipboard formats // clipboard formats
WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
WXDLLEXPORT int wxRegisterClipboardFormat(char *formatName); WXDLLEXPORT int wxRegisterClipboardFormat(wxChar *formatName);
WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
char *formatName, wxChar *formatName,
int maxCount); int maxCount);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

8
include/wx/msw/curico.h
View File

@@ -9,13 +9,13 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
HICON ReadIconFile( char *szFileName, HINSTANCE hInst, HICON ReadIconFile( wxChar *szFileName, HINSTANCE hInst,
int *W = 0, int *H = 0); int *W = 0, int *H = 0);
HCURSOR ReadCursorFile( char *szFileName, HINSTANCE hInst, HCURSOR ReadCursorFile( wxChar *szFileName, HINSTANCE hInst,
int *W = 0, int *H = 0, int *XHot = 0, int *YHot = 0); int *W = 0, int *H = 0, int *XHot = 0, int *YHot = 0);
HCURSOR IconToCursor( char *szFileName, HINSTANCE hInst, int XHot, int YHot, HCURSOR IconToCursor( wxChar *szFileName, HINSTANCE hInst, int XHot, int YHot,
int *W = 0, int *H = 0); int *W = 0, int *H = 0);
HICON CursorToIcon( char *szFileName, HINSTANCE hInst, HICON CursorToIcon( wxChar *szFileName, HINSTANCE hInst,
int *W = 0, int *H = 0); int *W = 0, int *H = 0);
HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint); HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint);

10
include/wx/msw/dde.h
View File

@@ -54,15 +54,15 @@ public:
~wxDDEConnection(void); ~wxDDEConnection(void);
// Calls that CLIENT can make // Calls that CLIENT can make
virtual bool Execute(char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxIPC_TEXT); } virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); }
virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
virtual bool Poke(const wxString& item, char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool StartAdvise(const wxString& item); virtual bool StartAdvise(const wxString& item);
virtual bool StopAdvise(const wxString& item); virtual bool StopAdvise(const wxString& item);
// Calls that SERVER can make // Calls that SERVER can make
virtual bool Advise(const wxString& item, char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
// Calls that both can make // Calls that both can make
virtual bool Disconnect(void); virtual bool Disconnect(void);
@@ -90,7 +90,7 @@ public:
wxDDEClient* m_client; wxDDEClient* m_client;
WXHCONV m_hConv; WXHCONV m_hConv;
char* m_sendingData; wxChar* m_sendingData;
int m_dataSize; int m_dataSize;
wxIPCFormat m_dataType; wxIPCFormat m_dataType;
}; };

2
include/wx/msw/dialog.h
View File

@@ -18,7 +18,7 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
// Dialog boxes // Dialog boxes
class WXDLLEXPORT wxDialog : public wxPanel class WXDLLEXPORT wxDialog : public wxPanel

12
include/wx/msw/dib.h
View File

@@ -10,17 +10,17 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Save (device dependent) wxBitmap as a DIB // Save (device dependent) wxBitmap as a DIB
bool wxSaveBitmap(char *filename, wxBitmap *bitmap, wxColourMap *colourmap = NULL); bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap *colourmap = NULL);
// Load device independent bitmap into device dependent bitmap // Load device independent bitmap into device dependent bitmap
wxBitmap *wxLoadBitmap(char *filename, wxColourMap **colourmap = NULL); wxBitmap *wxLoadBitmap(wxChar *filename, wxColourMap **colourmap = NULL);
// Load into existing bitmap; // Load into existing bitmap;
bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal = NULL); bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal); HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal);
BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette); BOOL ReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
HANDLE ReadDIB2(LPSTR lpFileName); HANDLE ReadDIB2(LPTSTR lpFileName);
LPSTR FindDIBBits (LPSTR lpbi); LPSTR FindDIBBits (LPTSTR lpbi);
HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo); HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo);

2
include/wx/msw/gauge95.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
// Group box // Group box
class WXDLLEXPORT wxGauge95 : public wxControl class WXDLLEXPORT wxGauge95 : public wxControl

2
include/wx/msw/gaugemsw.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
// Group box // Group box
class WXDLLEXPORT wxGaugeMSW: public wxControl class WXDLLEXPORT wxGaugeMSW: public wxControl

8
include/wx/msw/listbox.h
View File

@@ -84,8 +84,8 @@ public:
#endif // wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN
virtual void Append(const wxString& item); virtual void Append(const wxString& item);
virtual void Append(const wxString& item, char *clientData); virtual void Append(const wxString& item, void *clientData);
virtual void Set(int n, const wxString* choices, char **clientData = NULL); virtual void Set(int n, const wxString* choices, void **clientData = NULL);
virtual int FindString(const wxString& s) const ; virtual int FindString(const wxString& s) const ;
virtual void Clear(); virtual void Clear();
virtual void SetSelection(int n, bool select = TRUE); virtual void SetSelection(int n, bool select = TRUE);
@@ -95,8 +95,8 @@ public:
// For single choice list item only // For single choice list item only
virtual int GetSelection() const ; virtual int GetSelection() const ;
virtual void Delete(int n); virtual void Delete(int n);
virtual char *GetClientData(int n) const ; virtual void *GetClientData(int n) const ;
virtual void SetClientData(int n, char *clientData); virtual void SetClientData(int n, void *clientData);
virtual void SetString(int n, const wxString& s); virtual void SetString(int n, const wxString& s);
// For single or multiple choice list item // For single or multiple choice list item

2
include/wx/msw/msgdlg.h
View File

@@ -23,7 +23,7 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxMessageDialog: public wxDialog class WXDLLEXPORT wxMessageDialog: public wxDialog
{ {

8
include/wx/msw/private.h
View File

@@ -132,17 +132,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
* for this combination of CTl3D/FAFA settings * for this combination of CTl3D/FAFA settings
*/ */
#define STATIC_CLASS "STATIC" #define STATIC_CLASS _T("STATIC")
#define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE) #define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE)
#define CHECK_CLASS "BUTTON" #define CHECK_CLASS _T("BUTTON")
#define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD) #define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
#define CHECK_IS_FAFA FALSE #define CHECK_IS_FAFA FALSE
#define RADIO_CLASS "BUTTON" #define RADIO_CLASS _T("BUTTON")
#define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE) #define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE)
#define RADIO_SIZE 20 #define RADIO_SIZE 20
#define RADIO_IS_FAFA FALSE #define RADIO_IS_FAFA FALSE
#define PURE_WINDOWS #define PURE_WINDOWS
#define GROUP_CLASS "BUTTON" #define GROUP_CLASS _T("BUTTON")
#define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE) #define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)
/* /*

2
include/wx/msw/radiobox.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
// List box item // List box item
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;

2
include/wx/msw/radiobut.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
class WXDLLEXPORT wxRadioButton: public wxControl class WXDLLEXPORT wxRadioButton: public wxControl
{ {

2
include/wx/msw/scrolbar.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
// Scrollbar item // Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxControl class WXDLLEXPORT wxScrollBar: public wxControl

2
include/wx/msw/slider95.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
// Slider // Slider
class WXDLLEXPORT wxSlider95 : public wxControl class WXDLLEXPORT wxSlider95 : public wxControl

2
include/wx/msw/slidrmsw.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
// Slider // Slider
class WXDLLEXPORT wxSliderMSW : public wxControl class WXDLLEXPORT wxSliderMSW : public wxControl

2
include/wx/msw/statbmp.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
// a control showing an icon or a bitmap // a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmap : public wxControl class WXDLLEXPORT wxStaticBitmap : public wxControl

2
include/wx/msw/statbox.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
// Group box // Group box
class WXDLLEXPORT wxStaticBox : public wxControl class WXDLLEXPORT wxStaticBox : public wxControl

2
include/wx/msw/stattext.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticText : public wxControl class WXDLLEXPORT wxStaticText : public wxControl
{ {

2
include/wx/msw/tabctrl.h
View File

@@ -18,7 +18,7 @@
class wxImageList; class wxImageList;
// WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; // WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
/* /*
* Flags returned by HitTest * Flags returned by HitTest

2
include/wx/msw/tbarmsw.h
View File

@@ -20,7 +20,7 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
class WXDLLEXPORT wxMemoryDC; class WXDLLEXPORT wxMemoryDC;