AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-22 10:00:25 +00:00
parent 2d26882cdf
commit 42c37decc5
9 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/ogl/studio/cspalette.cpp
View File

@ -133,7 +133,7 @@ bool csApp::CreatePalette(wxFrame *parent)
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer")); palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer"));
palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text")); palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text"));
char** symbols = new char*[20]; wxChar** symbols = new wxChar*[20];
int noSymbols = 0; int noSymbols = 0;
symbols[noSymbols] = _T("Wide Rectangle"); symbols[noSymbols] = _T("Wide Rectangle");

4
contrib/samples/ogl/studio/csprint.cpp
View File

@ -190,8 +190,8 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
{ {
delete newBitmap; delete newBitmap;
char buf[200]; wxChar buf[200];
sprintf(buf, "Sorry, could not allocate clipboard bitmap (%dx%d)", (maxX+10), (maxY+10)); wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
wxMessageBox(buf, _T("Clipboard copy problem")); wxMessageBox(buf, _T("Clipboard copy problem"));
return FALSE; return FALSE;
} }

12
contrib/src/mmedia/cdwin.cpp
View File

@ -53,7 +53,7 @@ wxCDAudioWin::wxCDAudioWin(void)
DWORD ret; DWORD ret;
m_internal = new CDAW_Internal; m_internal = new CDAW_Internal;
open_struct.lpstrDeviceType = "cdaudio"; open_struct.lpstrDeviceType = _T("cdaudio");
ret = mciSendCommand(NULL, MCI_OPEN, MCI_OPEN_TYPE, ret = mciSendCommand(NULL, MCI_OPEN, MCI_OPEN_TYPE,
(DWORD)&open_struct); (DWORD)&open_struct);
if (ret) { if (ret) {
@ -89,13 +89,13 @@ void wxCDAudioWin::PrepareToc(void)
MCI_STATUS_PARMS status_struct; MCI_STATUS_PARMS status_struct;
wxUint16 i, nb_m_trksize; wxUint16 i, nb_m_trksize;
wxCDtime total_time, *trk; wxCDtime total_time, *trk;
DWORD ret, tmem; DWORD tmem;
if (!m_ok) if (!m_ok)
return; return;
status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS; status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
ret = mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM, mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)&status_struct); (DWORD)&status_struct);
nb_m_trksize = status_struct.dwReturn; nb_m_trksize = status_struct.dwReturn;
@ -103,7 +103,7 @@ void wxCDAudioWin::PrepareToc(void)
m_trkpos = new wxCDtime[nb_m_trksize+1]; m_trkpos = new wxCDtime[nb_m_trksize+1];
status_struct.dwItem = MCI_STATUS_LENGTH; status_struct.dwItem = MCI_STATUS_LENGTH;
ret = mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM, mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)&status_struct); (DWORD)&status_struct);
total_time.track = nb_m_trksize; total_time.track = nb_m_trksize;
tmem = status_struct.dwReturn; tmem = status_struct.dwReturn;
@ -115,7 +115,7 @@ void wxCDAudioWin::PrepareToc(void)
for (i=1;i<=nb_m_trksize;i++) { for (i=1;i<=nb_m_trksize;i++) {
status_struct.dwItem = MCI_STATUS_POSITION; status_struct.dwItem = MCI_STATUS_POSITION;
status_struct.dwTrack = i; status_struct.dwTrack = i;
ret = mciSendCommand(m_internal->dev_id, MCI_STATUS, mciSendCommand(m_internal->dev_id, MCI_STATUS,
MCI_STATUS_ITEM | MCI_TRACK, MCI_STATUS_ITEM | MCI_TRACK,
(DWORD)(LPVOID)&status_struct); (DWORD)(LPVOID)&status_struct);
tmem = status_struct.dwReturn; tmem = status_struct.dwReturn;
@ -129,7 +129,7 @@ void wxCDAudioWin::PrepareToc(void)
status_struct.dwItem = MCI_STATUS_LENGTH; status_struct.dwItem = MCI_STATUS_LENGTH;
status_struct.dwTrack = i; status_struct.dwTrack = i;
ret = mciSendCommand(m_internal->dev_id, MCI_STATUS, mciSendCommand(m_internal->dev_id, MCI_STATUS,
MCI_STATUS_ITEM | MCI_TRACK, MCI_STATUS_ITEM | MCI_TRACK,
(DWORD)(LPVOID)&status_struct); (DWORD)(LPVOID)&status_struct);
tmem = status_struct.dwReturn; tmem = status_struct.dwReturn;

4
contrib/src/mmedia/sndaiff.cpp
View File

@ -175,7 +175,7 @@ bool wxSoundAiff::PrepareToPlay()
return TRUE; return TRUE;
} }
bool wxSoundAiff::PrepareToRecord(wxUint32 time) bool wxSoundAiff::PrepareToRecord(wxUint32 WXUNUSED(time))
{ {
// TODO // TODO
return FALSE; return FALSE;
@ -187,7 +187,7 @@ bool wxSoundAiff::FinishRecording()
return FALSE; return FALSE;
} }
bool wxSoundAiff::RepositionStream(wxUint32 position) bool wxSoundAiff::RepositionStream(wxUint32 WXUNUSED(position))
{ {
// If the stream is not seekable "TellI() returns wxInvalidOffset" we cannot reposition stream // If the stream is not seekable "TellI() returns wxInvalidOffset" we cannot reposition stream
if (m_base_offset == wxInvalidOffset) if (m_base_offset == wxInvalidOffset)

4
contrib/src/mmedia/sndmsad.cpp
View File

@ -66,7 +66,7 @@ wxUint16 wxSoundFormatMSAdpcm::GetChannels() const
return m_nchannels; return m_nchannels;
} }
void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **coefs, wxUint16 ncoefs, void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **WXUNUSED(coefs), wxUint16 ncoefs,
wxUint16 coefs_len) wxUint16 coefs_len)
{ {
wxUint16 i; wxUint16 i;
@ -152,7 +152,7 @@ wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
delete m_router; delete m_router;
} }
wxSoundStream& wxSoundStreamMSAdpcm::Read(void *buffer, wxUint32 len) wxSoundStream& wxSoundStreamMSAdpcm::Read(void *WXUNUSED(buffer), wxUint32 WXUNUSED(len))
{ {
m_snderror = wxSOUND_NOCODEC; m_snderror = wxSOUND_NOCODEC;
m_lastcount = 0; m_lastcount = 0;

20
contrib/src/mmedia/sndwav.cpp
View File

@ -98,10 +98,10 @@ bool wxSoundWave::CanRead()
return TRUE; return TRUE;
} }
bool wxSoundWave::HandleOutputPCM(wxDataInputStream& data, wxUint32 len, bool wxSoundWave::HandleOutputPCM(wxDataInputStream& WXUNUSED(data), wxUint32 len,
wxUint16 channels, wxUint16 channels,
wxUint32 sample_fq, wxUint32 byte_p_sec, wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
wxUint16 byte_p_spl, wxUint16 bits_p_spl) wxUint16 WXUNUSED(byte_p_spl), wxUint16 bits_p_spl)
{ {
wxSoundFormatPcm sndformat; wxSoundFormatPcm sndformat;
@ -121,8 +121,8 @@ bool wxSoundWave::HandleOutputPCM(wxDataInputStream& data, wxUint32 len,
bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len, bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
wxUint16 channels, wxUint16 channels,
wxUint32 sample_fq, wxUint32 byte_p_sec, wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
wxUint16 byte_p_spl, wxUint16 bits_p_spl) wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
{ {
wxSoundFormatMSAdpcm sndformat; wxSoundFormatMSAdpcm sndformat;
wxInt16 *coefs[2]; wxInt16 *coefs[2];
@ -159,10 +159,10 @@ bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
return TRUE; return TRUE;
} }
bool wxSoundWave::HandleOutputG721(wxDataInputStream& data, wxUint32 len, bool wxSoundWave::HandleOutputG721(wxDataInputStream& WXUNUSED(data), wxUint32 len,
wxUint16 channels, wxUint16 WXUNUSED(channels),
wxUint32 sample_fq, wxUint32 byte_p_sec, wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
wxUint16 byte_p_spl, wxUint16 bits_p_spl) wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
{ {
wxSoundFormatG72X sndformat; wxSoundFormatG72X sndformat;
@ -402,7 +402,7 @@ bool wxSoundWave::FinishRecording()
return TRUE; return TRUE;
} }
bool wxSoundWave::RepositionStream(wxUint32 position) bool wxSoundWave::RepositionStream(wxUint32 WXUNUSED(position))
{ {
if (m_base_offset == wxInvalidOffset) if (m_base_offset == wxInvalidOffset)
return FALSE; return FALSE;

8
contrib/src/mmedia/sndwin.cpp
View File

@ -124,7 +124,7 @@ wxSoundStreamWin::~wxSoundStreamWin()
LRESULT APIENTRY _EXPORT LRESULT APIENTRY _EXPORT
_wxSoundHandlerWndProc(HWND hWnd, UINT message, _wxSoundHandlerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM WXUNUSED(lParam))
{ {
wxSoundStreamWin *sndwin; wxSoundStreamWin *sndwin;
@ -154,15 +154,13 @@ void wxSoundStreamWin::CreateSndWindow()
{ {
FARPROC proc = MakeProcInstance((FARPROC)_wxSoundHandlerWndProc, FARPROC proc = MakeProcInstance((FARPROC)_wxSoundHandlerWndProc,
wxGetInstance()); wxGetInstance());
int error;
// NB: class name must be kept in sync with wxCanvasClassName in // NB: class name must be kept in sync with wxCanvasClassName in
// src/msw/app.cpp! // src/msw/app.cpp!
m_internal->m_sndWin = ::CreateWindow(wxT("wxWindowClass"), NULL, 0, m_internal->m_sndWin = ::CreateWindow(wxT("wxWindowClass"), NULL, 0,
0, 0, 0, 0, NULL, (HMENU) NULL, 0, 0, 0, 0, NULL, (HMENU) NULL,
wxGetInstance(), NULL); wxGetInstance(), NULL);
error = GetLastError(); GetLastError();
::SetWindowLong(m_internal->m_sndWin, GWL_WNDPROC, (LONG)proc); ::SetWindowLong(m_internal->m_sndWin, GWL_WNDPROC, (LONG)proc);
@ -661,7 +659,7 @@ wxSoundStream& wxSoundStreamWin::Read(void *buffer, wxUint32 len)
// fragment finished. It reinitializes the parameters of the fragment and // fragment finished. It reinitializes the parameters of the fragment and
// sends an event to the clients. // sends an event to the clients.
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 dev_handle, int flag) void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 WXUNUSED(dev_handle), int flag)
{ {
wxSoundInfoHeader *info; wxSoundInfoHeader *info;

4
contrib/src/mmedia/vidbase.cpp
View File

@ -33,12 +33,12 @@ wxVideoBaseDriver::wxVideoBaseDriver()
m_video_output = NULL; m_video_output = NULL;
} }
wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& str) wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& WXUNUSED(str))
{ {
m_video_output = NULL; m_video_output = NULL;
} }
wxVideoBaseDriver::wxVideoBaseDriver(const wxString& filename) wxVideoBaseDriver::wxVideoBaseDriver(const wxString& WXUNUSED(filename))
{ {
m_video_output = NULL; m_video_output = NULL;
} }

17
contrib/src/mmedia/vidwin.cpp
View File

@ -48,7 +48,7 @@ wxVideoWindows::wxVideoWindows(wxInputStream& str)
{ {
m_internal = new wxVIDWinternal; m_internal = new wxVIDWinternal;
m_remove_file = TRUE; m_remove_file = TRUE;
m_filename = wxGetTempFileName("wxvid"); m_filename = wxGetTempFileName(_T("wxvid"));
m_paused = FALSE; m_paused = FALSE;
m_stopped = TRUE; m_stopped = TRUE;
m_frameRate = 1.0; m_frameRate = 1.0;
@ -84,13 +84,12 @@ void wxVideoWindows::OpenFile()
MCI_DGV_OPEN_PARMS openStruct; MCI_DGV_OPEN_PARMS openStruct;
MCI_DGV_SET_PARMS setStruct; MCI_DGV_SET_PARMS setStruct;
MCI_STATUS_PARMS statusStruct; MCI_STATUS_PARMS statusStruct;
DWORD ret;
openStruct.lpstrDeviceType = "avivideo"; openStruct.lpstrDeviceType = _T("avivideo");
openStruct.lpstrElementName = (LPSTR)(m_filename.mb_str()); openStruct.lpstrElementName = (wxChar *)m_filename.mb_str().data();
openStruct.hWndParent = 0; openStruct.hWndParent = 0;
ret = mciSendCommand(0, MCI_OPEN, mciSendCommand(0, MCI_OPEN,
MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT, MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
(DWORD)(LPVOID)&openStruct); (DWORD)(LPVOID)&openStruct);
m_internal->m_dev_id = openStruct.wDeviceID; m_internal->m_dev_id = openStruct.wDeviceID;
@ -99,20 +98,20 @@ void wxVideoWindows::OpenFile()
setStruct.dwCallback = 0; setStruct.dwCallback = 0;
setStruct.dwTimeFormat = MCI_FORMAT_FRAMES; setStruct.dwTimeFormat = MCI_FORMAT_FRAMES;
ret = mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT, mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
(DWORD)(LPVOID)&setStruct); (DWORD)(LPVOID)&setStruct);
statusStruct.dwCallback = 0; statusStruct.dwCallback = 0;
statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE; statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE;
ret = mciSendCommand(m_internal->m_dev_id, MCI_STATUS, mciSendCommand(m_internal->m_dev_id, MCI_STATUS,
MCI_STATUS_ITEM, MCI_STATUS_ITEM,
(DWORD)(LPVOID)&statusStruct); (DWORD)(LPVOID)&statusStruct);
m_frameRate = ((double)statusStruct.dwReturn) / 1000; m_frameRate = ((double)statusStruct.dwReturn) / 1000;
statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE; statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE;
ret = mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM, mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)(LPVOID)&statusStruct); (DWORD)(LPVOID)&statusStruct);
m_bps = statusStruct.dwReturn; m_bps = statusStruct.dwReturn;
@ -151,7 +150,7 @@ bool wxVideoWindows::GetSize(wxSize& size) const
return TRUE; return TRUE;
} }
bool wxVideoWindows::SetSize(wxSize size) bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))
{ {
return TRUE; return TRUE;
} }