projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make wxEVT_SCROLL_ENDSCROLL a #define in event.h so that new applications
[wxWidgets.git]
/
include
/
wx
/
univ
/
button.h
diff --git
a/include/wx/univ/button.h
b/include/wx/univ/button.h
index 524d873f09315642b2bc7c073539721feb645995..68a56beb8e8bd5ad0e5fed4337aea830634ea083 100644
(file)
--- a/
include/wx/univ/button.h
+++ b/
include/wx/univ/button.h
@@
-6,13
+6,13
@@
// Created: 15.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
// Created: 15.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UNIV_BUTTON_H_
#define _WX_UNIV_BUTTON_H_
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UNIV_BUTTON_H_
#define _WX_UNIV_BUTTON_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "univbutton.h"
#endif
#pragma interface "univbutton.h"
#endif
@@
-40,7
+40,7
@@
public:
wxButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
wxButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-51,10
+51,10
@@
public:
Create(parent, id, bitmap, label, pos, size, style, validator, name);
}
Create(parent, id, bitmap, label, pos, size, style, validator, name);
}
-
+
wxButton(wxWindow *parent,
wxWindowID id,
wxButton(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-68,7
+68,7
@@
public:
bool Create(wxWindow *parent,
wxWindowID id,
bool Create(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-78,11
+78,11
@@
public:
return Create(parent, id, wxNullBitmap, label,
pos, size, style, validator, name);
}
return Create(parent, id, wxNullBitmap, label,
pos, size, style, validator, name);
}
-
+
bool Create(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
bool Create(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-113,7
+113,7
@@
protected:
virtual bool DoDrawBackground(wxDC& dc);
virtual void DoDraw(wxControlRenderer *renderer);
virtual bool DoDrawBackground(wxDC& dc);
virtual void DoDraw(wxControlRenderer *renderer);
- virtual bool CanBeHighlighted() const { return
TRUE
; }
+ virtual bool CanBeHighlighted() const { return
true
; }
// common part of all ctors
void Init();
// common part of all ctors
void Init();