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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-07 19:16:15 +00:00
parent 48f7ffbe93
commit ed7fdb8606
5 changed files with 8 additions and 21 deletions

View File

@@ -103,8 +103,6 @@ bitmap "focus" ,
bitmap "disabled" ,
*/
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos,

View File

@@ -76,7 +76,6 @@ static HWND invalidHandle = 0;
// constants
// ---------------------------------------------------------------------------
static const int IDM_WINDOWTILE = 4001;
static const int IDM_WINDOWTILEHOR = 4001;
static const int IDM_WINDOWCASCADE = 4002;
static const int IDM_WINDOWICONS = 4003;
@@ -88,10 +87,6 @@ static const int IDM_WINDOWPREV = 4006;
static const int wxFIRST_MDI_CHILD = 4100;
static const int wxLAST_MDI_CHILD = 4600;
// Status border dimensions
static const int wxTHICK_LINE_BORDER = 3;
static const int wxTHICK_LINE_WIDTH = 1;
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------

View File

@@ -66,8 +66,6 @@
// global variables
// ----------------------------------------------------------------------------
extern wxMenu *wxCurrentPopupMenu;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
@@ -229,7 +227,7 @@ void wxMenu::Init()
}
// if we have a title, insert it in the beginning of the menu
if ( !m_title.IsEmpty() )
if ( !m_title.empty() )
{
Append(idMenuTitle, m_title);
AppendSeparator();
@@ -633,14 +631,14 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
void wxMenu::SetTitle(const wxString& label)
{
bool hasNoTitle = m_title.IsEmpty();
bool hasNoTitle = m_title.empty();
m_title = label;
HMENU hMenu = GetHmenu();
if ( hasNoTitle )
{
if ( !label.IsEmpty() )
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title) ||
@@ -652,7 +650,7 @@ void wxMenu::SetTitle(const wxString& label)
}
else
{
if ( label.IsEmpty() )
if ( label.empty() )
{
// remove the title and the separator after it
if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
@@ -689,7 +687,7 @@ void wxMenu::SetTitle(const wxString& label)
#ifdef __WIN32__
// put the title string in bold face
if ( !m_title.IsEmpty() )
if ( !m_title.empty() )
{
SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
}

View File

@@ -787,7 +787,6 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
_T("RemoveCommand() needs an extension and a verb") );
wxString sKey = m_strFileType;
wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
// if the key already doesn't exist, it's a success

View File

@@ -93,9 +93,6 @@
// these values correspond to those used by comctl32.dll
#define DEFAULTBITMAPX 16
#define DEFAULTBITMAPY 15
#define DEFAULTBUTTONX 24
#define DEFAULTBUTTONY 24
#define DEFAULTBARHEIGHT 27
// ----------------------------------------------------------------------------
// wxWin macros