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

various compilation/warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-23 19:04:42 +00:00
parent 2db1bd2234
commit 7df07b10aa
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/dynarray.h
View File

@@ -122,6 +122,7 @@ classexp name : public std::vector<T> \
{ \ { \
typedef predicate Predicate; \ typedef predicate Predicate; \
typedef predicate::CMPFUNC SCMPFUNC; \ typedef predicate::CMPFUNC SCMPFUNC; \
public: \
typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC; \ typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC; \
public: \ public: \
void Empty() { clear(); } \ void Empty() { clear(); } \

5
include/wx/renderer.h
View File

@@ -26,9 +26,10 @@
#define _WX_RENDERER_H_ #define _WX_RENDERER_H_
class WXDLLEXPORT wxDC; class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxRect;
class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxWindow;
#include "wx/gdicmn.h" // for wxPoint
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -61,6 +62,8 @@ enum
class WXDLLEXPORT wxRendererNative class WXDLLEXPORT wxRendererNative
{ {
public: public:
virtual ~wxRendererNative() { } // stop GCC warning
// drawing functions // drawing functions
// ----------------- // -----------------

2
samples/checklst/checklst.cpp
View File

@@ -310,7 +310,7 @@ void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
{ {
wxString strSelection; wxString strSelection;
strSelection.sprintf(wxT("Item %d double clicked"), m_pListBox->GetSelection()); strSelection.Printf(wxT("Item %d double clicked"), m_pListBox->GetSelection());
wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION); wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
dialog.ShowModal(); dialog.ShowModal();
} }

2
samples/shaped/shaped.cpp
View File

@@ -159,7 +159,7 @@ ShapedFrame::ShapedFrame()
) )
{ {
m_hasShape = FALSE; m_hasShape = FALSE;
m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG); m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG);
SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight())); SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
#ifndef __WXMAC__ #ifndef __WXMAC__
// On wxMac the tooltip gets clipped by the window shape, YUCK!! // On wxMac the tooltip gets clipped by the window shape, YUCK!!

2
samples/treectrl/treetest.cpp
View File

@@ -1107,7 +1107,7 @@ void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
{ {
wxPoint pt = event.GetPosition(); wxPoint pt = event.GetPosition();
wxTreeItemId item = GetSelection(); wxTreeItemId item = GetSelection();
wxLogMessage("OnContextMenu at screen coords (%i, %i)", pt.x, pt.y); wxLogMessage(wxT("OnContextMenu at screen coords (%i, %i)"), pt.x, pt.y);
//check if event was generated by keyboard (MSW-specific?) //check if event was generated by keyboard (MSW-specific?)
if (pt.x==-1 && pt.y==-1) //(this is how MSW indicates it) if (pt.x==-1 && pt.y==-1) //(this is how MSW indicates it)

35
samples/validate/validate.cpp
View File

@@ -43,13 +43,13 @@
MyData g_data; MyData g_data;
wxString g_listbox_choices[] = wxString g_listbox_choices[] =
{"one", "two", "three"}; {wxT("one"), wxT("two"), wxT("three")};
wxString g_combobox_choices[] = wxString g_combobox_choices[] =
{"yes", "no", "maybe"}; {wxT("yes"), wxT("no"), wxT("maybe")};
wxString g_radiobox_choices[] = wxString g_radiobox_choices[] =
{"green", "yellow", "red"}; {wxT("green"), wxT("yellow"), wxT("red")};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// MyData // MyData
@@ -62,7 +62,7 @@ MyData::MyData()
// is performed only when 'OK' is pressed. It would be nice to // is performed only when 'OK' is pressed. It would be nice to
// enhance this so that validation would occur when the text // enhance this so that validation would occur when the text
// control loses focus. // control loses focus.
m_string = "Spaces are invalid here"; m_string = wxT("Spaces are invalid here");
m_listbox_choices.Add(0); m_listbox_choices.Add(0);
} }
@@ -75,7 +75,8 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create and display the main frame window. // Create and display the main frame window.
MyFrame *frame = new MyFrame((wxFrame *) NULL, "Validator Test", 50, 50, 300, 250); MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
50, 50, 300, 250);
frame->Show(true); frame->Show(true);
SetTopWindow(frame); SetTopWindow(frame);
return true; return true;
@@ -91,7 +92,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(VALIDATE_TOGGLE_BELL, MyFrame::OnToggleBell) EVT_MENU(VALIDATE_TOGGLE_BELL, MyFrame::OnToggleBell)
END_EVENT_TABLE() END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h) MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h)
: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)), : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
m_silent(true) m_silent(true)
{ {
@@ -105,13 +106,13 @@ MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h)
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append(VALIDATE_TEST_DIALOG, "&Test", "Demonstrate validators"); file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test"), wxT("Demonstrate validators"));
file_menu->Append(VALIDATE_TOGGLE_BELL, "&Bell on error", "Toggle bell on error", true); file_menu->Append(VALIDATE_TOGGLE_BELL, wxT("&Bell on error"), wxT("Toggle bell on error"), true);
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(wxID_EXIT, "E&xit"); file_menu->Append(wxID_EXIT, wxT("E&xit"));
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "File"); menu_bar->Append(file_menu, wxT("File"));
SetMenuBar(menu_bar); SetMenuBar(menu_bar);
// All validators share a common (static) flag that controls // All validators share a common (static) flag that controls
@@ -133,7 +134,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
// and variables together. Values are transferred between them behind // and variables together. Values are transferred between them behind
// the scenes, so here we don't have to query the controls for their // the scenes, so here we don't have to query the controls for their
// values. // values.
MyDialog dialog(this, "Validator demonstration"); MyDialog dialog(this, wxT("Validator demonstration"));
// When the dialog is displayed, validators automatically transfer // When the dialog is displayed, validators automatically transfer
// data from variables to their corresponding controls. // data from variables to their corresponding controls.
@@ -183,7 +184,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
// Pointers to some of these controls are saved in member variables // Pointers to some of these controls are saved in member variables
// so that we can use them elsewhere, like this one. // so that we can use them elsewhere, like this one.
text = new wxTextCtrl(this, VALIDATE_TEXT, "", text = new wxTextCtrl(this, VALIDATE_TEXT, wxT(""),
wxPoint(10, 10), wxSize(120, -1), 0, wxPoint(10, 10), wxSize(120, -1), 0,
wxTextValidator(wxFILTER_ALPHA, &g_data.m_string)); wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
flexgridsizer->Add(text); flexgridsizer->Add(text);
@@ -192,7 +193,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
// because we don't use it elsewhere--it can be anonymous. // because we don't use it elsewhere--it can be anonymous.
// We don't need any such pointer to query its state, which // We don't need any such pointer to query its state, which
// can be gotten directly from g_data. // can be gotten directly from g_data.
flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, "Sample checkbox", flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, wxT("Sample checkbox"),
wxPoint(130, 10), wxSize(120, -1), 0, wxPoint(130, 10), wxSize(120, -1), 0,
wxGenericValidator(&g_data.m_checkbox_state))); wxGenericValidator(&g_data.m_checkbox_state)));
@@ -201,7 +202,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
3, g_listbox_choices, wxLB_MULTIPLE, 3, g_listbox_choices, wxLB_MULTIPLE,
wxGenericValidator(&g_data.m_listbox_choices))); wxGenericValidator(&g_data.m_listbox_choices)));
combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, "", combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, wxT(""),
wxPoint(130, 30), wxSize(120, -1), wxPoint(130, 30), wxSize(120, -1),
3, g_combobox_choices, 0L, 3, g_combobox_choices, 0L,
wxGenericValidator(&g_data.m_combobox_choice)); wxGenericValidator(&g_data.m_combobox_choice));
@@ -209,7 +210,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10); mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, "Pick a color", mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
wxPoint(10, 100), wxSize(-1, -1), wxPoint(10, 100), wxSize(-1, -1),
3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS, 3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
wxGenericValidator(&g_data.m_radiobox_choice)), wxGenericValidator(&g_data.m_radiobox_choice)),
@@ -217,10 +218,10 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
wxGridSizer *gridsizer = new wxGridSizer(2, 2, 5, 5); wxGridSizer *gridsizer = new wxGridSizer(2, 2, 5, 5);
wxButton *ok_button = new wxButton(this, wxID_OK, "OK", wxPoint(250, 70), wxSize(80, 30)); wxButton *ok_button = new wxButton(this, wxID_OK, wxT("OK"), wxPoint(250, 70), wxSize(80, 30));
ok_button->SetDefault(); ok_button->SetDefault();
gridsizer->Add(ok_button); gridsizer->Add(ok_button);
gridsizer->Add(new wxButton(this, wxID_CANCEL, "Cancel", wxPoint(250, 100), wxSize(80, 30))); gridsizer->Add(new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxPoint(250, 100), wxSize(80, 30)));
mainsizer->Add(gridsizer, 0, wxGROW | wxALL, 10); mainsizer->Add(gridsizer, 0, wxGROW | wxALL, 10);

2
samples/validate/validate.h
View File

@@ -32,7 +32,7 @@ public:
class MyFrame : public wxFrame class MyFrame : public wxFrame
{ {
public: public:
MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h); MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnTestDialog(wxCommandEvent& event); void OnTestDialog(wxCommandEvent& event);

4
src/common/valtext.cpp
View File

@@ -244,8 +244,8 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
if ( if (
!(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
( (
((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((char) keyCode, 1))) || ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((wxChar) keyCode, 1))) ||
((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) keyCode, 1))) || ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((wxChar) keyCode, 1))) ||
((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||