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

Couple more Unicode fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:20:58 +00:00
parent c47d0f2eb1
commit 9df8c2df09
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,8 @@ typedef HANDLE HDIB;
**************************************************************************/ **************************************************************************/
void ClearSystemPalette(void); void ClearSystemPalette(void);
PDIB DibOpenFile(LPSTR szFile); PDIB DibOpenFile(LPTSTR szFile);
int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi); int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi);
BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage); BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage);
PDIB DibCreate(int bits, int dx, int dy); PDIB DibCreate(int bits, int dx, int dy);
BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal); BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal);

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

@@ -160,8 +160,8 @@ public:
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
bool MSWCreate(int id, wxWindow *parent, const char *wclass, bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
wxWindow *wx_win, const char *title, wxWindow *wx_win, const wxChar *title,
int x, int y, int width, int height, long style); int x, int y, int width, int height, long style);
// tooltip management // tooltip management

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

@@ -416,7 +416,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
// Add to pool: necessary because Windows needs to have a string // Add to pool: necessary because Windows needs to have a string
// still exist across 3 callbacks. // still exist across 3 callbacks.
char *AddPool(const wxString& str); wxChar *AddPool(const wxString& str);
protected: protected:
wxTextCtrl* m_textCtrl; // The control used for editing a label wxTextCtrl* m_textCtrl; // The control used for editing a label

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

@@ -217,7 +217,7 @@ public:
// notifications: return FALSE to prevent the menu from being // notifications: return FALSE to prevent the menu from being
// appended/deleted // appended/deleted
virtual bool OnAppend(wxMenu *menu, const char *title); virtual bool OnAppend(wxMenu *menu, const wxChar *title);
virtual bool OnDelete(wxMenu *menu, int index); virtual bool OnDelete(wxMenu *menu, int index);
// item search // item search

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

@@ -43,7 +43,7 @@ class wxPNGReader
{ {
protected: protected:
int filetype; int filetype;
char filename[255]; wxChar filename[255];
ImagePointerType RawImage; // Image data ImagePointerType RawImage; // Image data
int Width, Height; // Dimensions int Width, Height; // Dimensions
@@ -61,14 +61,14 @@ protected:
friend class wxPNGReaderIter; friend class wxPNGReaderIter;
public: public:
wxPNGReader(void); wxPNGReader(void);
wxPNGReader (char* ImageFileName); // Read an image file wxPNGReader (wxChar* ImageFileName); // Read an image file
~wxPNGReader (); ~wxPNGReader ();
void Create(int width, int height, int deep, int colortype=-1); void Create(int width, int height, int deep, int colortype=-1);
bool ReadFile( char* ImageFileName=0 ); bool ReadFile( wxChar* ImageFileName=0 );
bool SaveFile( char* ImageFileName=0 ); bool SaveFile( wxChar* ImageFileName=0 );
bool SaveXPM(char *filename, char *name = 0); bool SaveXPM(wxChar *filename, wxChar *name = 0);
int GetWidth( void ) const { return Width; }; int GetWidth( void ) const { return Width; };
int GetHeight( void ) const { return Height; }; int GetHeight( void ) const { return Height; };
int GetDepth( void ) const { return Depth; }; int GetDepth( void ) const { return Depth; };

6
include/wx/msw/window.h
View File

@@ -216,12 +216,12 @@ public:
// returns TRUE if the window has been created // returns TRUE if the window has been created
bool MSWCreate(int id, bool MSWCreate(int id,
wxWindow *parent, wxWindow *parent,
const char *wclass, const wxChar *wclass,
wxWindow *wx_win, wxWindow *wx_win,
const char *title, const wxChar *title,
int x, int y, int width, int height, int x, int y, int width, int height,
WXDWORD style, WXDWORD style,
const char *dialog_template = NULL, const wxChar *dialog_template = NULL,
WXDWORD exendedStyle = 0); WXDWORD exendedStyle = 0);
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);