projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change GetC to return an int so that it can return wxEOF on error.
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
stattext.h
diff --git
a/include/wx/gtk1/stattext.h
b/include/wx/gtk1/stattext.h
index 6686c96982fd80da969685882386aaf5925a2a6f..d114e7b09eb23932aa89a14b57b0edaeb03601b9 100644
(file)
--- a/
include/wx/gtk1/stattext.h
+++ b/
include/wx/gtk1/stattext.h
@@
-1,20
+1,15
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.h
+// Name:
wx/gtk1/
stattext.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKSTATICTEXTH__
#define __GTKSTATICTEXTH__
#ifndef __GTKSTATICTEXTH__
#define __GTKSTATICTEXTH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
@@
-24,7
+19,7
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxStaticText;
+class
WXDLLIMPEXP_CORE
wxStaticText;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
// global data
@@
-34,7
+29,7
@@
class wxStaticText;
// wxStaticText
//-----------------------------------------------------------------------------
// wxStaticText
//-----------------------------------------------------------------------------
-class wxStaticText : public wxControl
+class
WXDLLIMPEXP_CORE
wxStaticText : public wxControl
{
public:
wxStaticText();
{
public:
wxStaticText();
@@
-42,7
+37,7
@@
public:
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
+ const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr );
long style = 0,
const wxString &name = wxStaticTextNameStr );
@@
-50,7
+45,7
@@
public:
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
+ const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr );
long style = 0,
const wxString &name = wxStaticTextNameStr );
@@
-62,14
+57,22
@@
public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
+ // see wx/stattext.h
+ void Wrap(int width);
+
// implementation
// --------------
protected:
// implementation
// --------------
protected:
+ virtual void DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags = wxSIZE_AUTO);
+
virtual wxSize DoGetBestSize() const;
DECLARE_DYNAMIC_CLASS(wxStaticText)
};
virtual wxSize DoGetBestSize() const;
DECLARE_DYNAMIC_CLASS(wxStaticText)
};
-#endif // __GTKSTATICTEXTH__
+#endif
+ // __GTKSTATICTEXTH__