From: Ove Kaaven <ovek@arcticnet.no>
Date: Mon, 14 Jun 1999 14:20:58 +0000 (+0000)
Subject: Couple more Unicode fixes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9df8c2df09b78461a52f8b6d12ee9f3475e8c3da

Couple more Unicode fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h
index 75970604f8..152f67a2c7 100644
--- a/include/wx/msw/dibutils.h
+++ b/include/wx/msw/dibutils.h
@@ -41,8 +41,8 @@ typedef     HANDLE             HDIB;
  **************************************************************************/
 
 void        ClearSystemPalette(void);
-PDIB        DibOpenFile(LPSTR szFile);  
-int 			DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi);
+PDIB        DibOpenFile(LPTSTR szFile);  
+int 			DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi);
 BOOL        DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage);
 PDIB        DibCreate(int bits, int dx, int dy);
 BOOL        DibMapToPalette(PDIB pdib, HPALETTE hpal);
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index ba106bdcd2..7dfaf63fc6 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -160,8 +160,8 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
-    bool MSWCreate(int id, wxWindow *parent, const char *wclass,
-                   wxWindow *wx_win, const char *title,
+    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
+                   wxWindow *wx_win, const wxChar *title,
                    int x, int y, int width, int height, long style);
 
   // tooltip management
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index dbde573c9f..0b1eecff65 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -416,7 +416,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Add to pool: necessary because Windows needs to have a string
   // still exist across 3 callbacks.
-  char *AddPool(const wxString& str);
+  wxChar *AddPool(const wxString& str);
 
 protected:
   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 5e553d3d4c..c36a5fced2 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -217,7 +217,7 @@ public:
 
     // notifications: return FALSE to prevent the menu from being
     // 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);
 
     // item search
diff --git a/include/wx/msw/pngread.h b/include/wx/msw/pngread.h
index 637904521a..c3326bc411 100644
--- a/include/wx/msw/pngread.h
+++ b/include/wx/msw/pngread.h
@@ -43,7 +43,7 @@ class wxPNGReader
 {
 protected:
   int filetype;
-  char filename[255];
+  wxChar filename[255];
   ImagePointerType RawImage;  		//  Image data
 
   int Width, Height;   		//  Dimensions
@@ -61,14 +61,14 @@ protected:
 friend class wxPNGReaderIter;
 public:
   wxPNGReader(void);
-  wxPNGReader (char* ImageFileName);     // Read an image file
+  wxPNGReader (wxChar* ImageFileName);     // Read an image file
   ~wxPNGReader ();
 
   void Create(int width, int height, int deep, int colortype=-1);
 
-  bool ReadFile( char* ImageFileName=0 );
-  bool SaveFile( char* ImageFileName=0 );
-  bool SaveXPM(char *filename, char *name = 0);
+  bool ReadFile( wxChar* ImageFileName=0 );
+  bool SaveFile( wxChar* ImageFileName=0 );
+  bool SaveXPM(wxChar *filename, wxChar *name = 0);
   int  GetWidth( void ) const { return Width; };
   int  GetHeight( void ) const { return Height; };
   int  GetDepth( void ) const { return Depth; };
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 8349de73e3..c218411d05 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -216,12 +216,12 @@ public:
     // returns TRUE if the window has been created
     bool MSWCreate(int id,
                    wxWindow *parent,
-                   const char *wclass,
+                   const wxChar *wclass,
                    wxWindow *wx_win,
-                   const char *title,
+                   const wxChar *title,
                    int x, int y, int width, int height,
                    WXDWORD style,
-                   const char *dialog_template = NULL,
+                   const wxChar *dialog_template = NULL,
                    WXDWORD exendedStyle = 0);
     virtual bool MSWCommand(WXUINT param, WXWORD id);