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

First part of '[ 1216148 ] cleanup: unused variables and declarations'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-06-07 19:01:45 +00:00
parent 9ba4b498e3
commit 48f7ffbe93
11 changed files with 221 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/event.h
View File

@ -2195,8 +2195,6 @@ private:
wxEventTableEntry& operator=(const wxEventTableEntry&);
};
class WXDLLIMPEXP_BASE wxEvtHandler;
// an entry used in dynamic event table managed by wxEvtHandler::Connect()
struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase
{
@ -2237,7 +2235,6 @@ struct WXDLLIMPEXP_BASE wxEventTable
// ----------------------------------------------------------------------------
WX_DEFINE_ARRAY_PTR(const wxEventTableEntry*, wxEventTableEntryPointerArray);
class WXDLLIMPEXP_BASE wxEvtHandler;
class WXDLLIMPEXP_BASE wxEventHashTable
{

2
include/wx/list.h
View File

@ -328,8 +328,6 @@ private:
extern WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
#endif
class WXDLLEXPORT wxObjectListNode;
// undef it to get rid of old, deprecated functions
#define wxLIST_COMPATIBILITY

4
src/common/cmndata.cpp
View File

@ -67,10 +67,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
#ifndef DMPAPER_USER
#define DMPAPER_USER 256
#endif
// ============================================================================
// implementation
// ============================================================================

4
src/common/dynarray.cpp
View File

@ -29,10 +29,6 @@
#include <stdlib.h>
#include <string.h> // for memmove
#ifndef max
#define max(a, b) (((a) > (b)) ? (a) : (b))
#endif
// we cast the value to long from which we cast it to void * in IndexForInsert:
// this can't work if the pointers are not big enough
wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *),

7
src/common/fontmap.cpp
View File

@ -330,7 +330,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
wxString configEntry,
encName = GetEncodingName(encoding);
if ( !facename.IsEmpty() )
if ( !facename.empty() )
{
configEntry = facename + _T("_");
}
@ -354,13 +354,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
}
else // use the info entered the last time
{
if ( !fontinfo.IsEmpty() && !facename.IsEmpty() )
if ( !fontinfo.empty() && !facename.empty() )
{
// we tried to find a match with facename -- now try without it
fontinfo = GetConfig()->Read(encName);
}
if ( !fontinfo.IsEmpty() )
if ( !fontinfo.empty() )
{
if ( info->FromString(fontinfo) )
{
@ -443,7 +443,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
if ( dialog.ShowModal() == wxID_OK )
{
wxFontData retData = dialog.GetFontData();
wxFont font = retData.GetChosenFont();
*info = retData.EncodingInfo();
info->encoding = retData.GetEncoding();

20
src/common/http.cpp
View File

@ -40,8 +40,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)
#define HTTP_BSIZE 2048
wxHTTP::wxHTTP()
: wxProtocol()
{
@ -188,7 +186,8 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
return false;
}
if ( port ) addr->Service(port);
if ( port )
addr->Service(port);
else if (!addr->Service(wxT("http")))
addr->Service(80);
@ -217,15 +216,18 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
{
const wxChar *request;
switch (req) {
switch (req)
{
case wxHTTP_GET:
request = wxT("GET");
break;
case wxHTTP_POST:
request = wxT("POST");
if ( GetHeader( wxT("Content-Length") ).IsNull() )
SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
break;
default:
return false;
}
@ -280,16 +282,20 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
m_http_response = wxAtoi(tmp_str2);
switch (tmp_str2[0u]) {
switch (tmp_str2[0u])
{
case wxT('1'):
/* INFORMATION / SUCCESS */
break;
case wxT('2'):
/* SUCCESS */
break;
case wxT('3'):
/* REDIRECTION */
break;
default:
m_perr = wxPROTO_NOFILE;
RestoreState();
@ -359,12 +365,12 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
return NULL;
#endif
if (!BuildRequest(path, m_post_buf.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))
if (!BuildRequest(path, m_post_buf.empty() ? wxHTTP_GET : wxHTTP_POST))
return NULL;
inp_stream = new wxHTTPStream(this);
if (!GetHeader(wxT("Content-Length")).IsEmpty())
if (!GetHeader(wxT("Content-Length")).empty())
inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
else
inp_stream->m_httpsize = (size_t)-1;

6
src/common/list.cpp
View File

@ -594,12 +594,6 @@ void wxObjectListNode::DeleteData()
// wxStringList
// ----------------------------------------------------------------------------
static inline wxChar* MYcopystring(const wxString& s)
{
wxChar* copy = new wxChar[s.length() + 1];
return wxStrcpy(copy, s.c_str());
}
static inline wxChar* MYcopystring(const wxChar* s)
{
wxChar* copy = new wxChar[wxStrlen(s) + 1];

2
src/generic/dirdlgg.cpp
View File

@ -47,8 +47,6 @@
static const int ID_DIRCTRL = 1000;
static const int ID_TEXTCTRL = 1001;
static const int ID_OK = 1002;
static const int ID_CANCEL = 1003;
static const int ID_NEW = 1004;
static const int ID_SHOW_HIDDEN = 1005;
static const int ID_GO_HOME = 1006;

6
src/generic/filedlgg.cpp
View File

@ -143,11 +143,6 @@ int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
#define IsTopMostDir(dir) (dir.empty())
#endif
#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
// defined in src/generic/dirctrlg.cpp
extern bool wxIsDriveAvailable(const wxString& dirName);
#endif
// defined in src/generic/dirctrlg.cpp
extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids);
@ -855,7 +850,6 @@ wxFileCtrl::~wxFileCtrl()
#define ID_CHOICE (wxID_FILEDLGG + 8)
#define ID_TEXT (wxID_FILEDLGG + 9)
#define ID_LIST_CTRL (wxID_FILEDLGG + 10)
#define ID_ACTIVATED (wxID_FILEDLGG + 11)
#define ID_CHECK (wxID_FILEDLGG + 12)
IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)

3
src/generic/listctrl.cpp
View File

@ -2243,9 +2243,6 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
wxSOLID
);
wxSize sz = size;
sz.y = 25;
SetScrollbars( 0, 0, 0, 0, 0, 0 );
wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();

2
src/generic/statusbr.cpp
View File

@ -56,7 +56,6 @@ END_EVENT_TABLE()
// Default status border dimensions
#define wxTHICK_LINE_BORDER 2
#define wxTHICK_LINE_WIDTH 1
void wxStatusBarGeneric::Init()
{
@ -471,4 +470,3 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
}
#endif // wxUSE_STATUSBAR