projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separation of wxUSE_FILEDLG and wxUSE_DIRDLG in generic implementations.
[wxWidgets.git]
/
include
/
wx
/
x11
/
window.h
diff --git
a/include/wx/x11/window.h
b/include/wx/x11/window.h
index feace83629c6736762616ab635cd0c45b61109f1..057961575f1037f5ef5b8d12bdd0ca17a5c36bb6 100644
(file)
--- a/
include/wx/x11/window.h
+++ b/
include/wx/x11/window.h
@@
-12,7
+12,7
@@
#ifndef _WX_WINDOW_H_
#define _WX_WINDOW_H_
#ifndef _WX_WINDOW_H_
#define _WX_WINDOW_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "window.h"
#endif
#pragma interface "window.h"
#endif
@@
-64,8
+64,6
@@
public:
const wxRect *rect = (const wxRect *) NULL );
virtual void Update();
const wxRect *rect = (const wxRect *) NULL );
virtual void Update();
- virtual void Clear();
-
virtual bool SetBackgroundColour( const wxColour &colour );
virtual bool SetForegroundColour( const wxColour &colour );
virtual bool SetBackgroundColour( const wxColour &colour );
virtual bool SetForegroundColour( const wxColour &colour );
@@
-87,6
+85,10
@@
public:
virtual void SetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1);
virtual void SetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1);
+ void SetSizeHints( const wxSize& minSize,
+ const wxSize& maxSize=wxDefaultSize,
+ const wxSize& incSize=wxDefaultSize)
+ { wxWindowBase::SetSizeHints(minSize, maxSize, incSize); }
#if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP
@@
-107,8
+109,8
@@
public:
virtual WXWindow GetMainWindow() const;
// Get X11 window representing the client area
virtual WXWindow GetMainWindow() const;
// Get X11 window representing the client area
- virtual WXWindow GetClientWindow() const;
-
+ virtual WXWindow GetClient
Area
Window() const;
+
void SetLastClick(int button, long timestamp)
{ m_lastButton = button; m_lastTS = timestamp; }
void SetLastClick(int button, long timestamp)
{ m_lastButton = button; m_lastTS = timestamp; }
@@
-155,9
+157,6
@@
public:
// OnInternalIdle
virtual void OnInternalIdle();
// OnInternalIdle
virtual void OnInternalIdle();
- // For compatibility across platforms (not in event table)
- void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
-
protected:
// Responds to colour changes: passes event on to children.
void OnSysColourChanged(wxSysColourChangedEvent& event);
protected:
// Responds to colour changes: passes event on to children.
void OnSysColourChanged(wxSysColourChangedEvent& event);