Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get/SetTitle only for wxTopLevelWindow (wxX11 part, final)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-11-10 12:03:39 +00:00
parent 75865c8dc7
commit ffd84c9476
6 changed files with 212 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/toplevel.h
View File

@@ -154,23 +154,10 @@ public:
// return true if the frame is in fullscreen mode // return true if the frame is in fullscreen mode
virtual bool IsFullScreen() const = 0; virtual bool IsFullScreen() const = 0;
#if defined(__WXMSW__) || \ // the title of the top level window: the text which the
defined(__WXMGL__) || \ // window shows usually at the top of the frame/dialog in dedicated bar
defined(__WXMOTIF__) || \
defined(__WXPM__) || \
defined(__WXMAC__) || \
defined(__WXCOCOA__) || \
defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
// to wxTopLevelWindow so initially enabled in wxMSW only to observe results
// and continue on other platforms
// the title (or label, see below) of the window: the text which the
// window shows
virtual void SetTitle(const wxString& title) = 0; virtual void SetTitle(const wxString& title) = 0;
virtual wxString GetTitle() const = 0; virtual wxString GetTitle() const = 0;
#endif
// Set the shape of the window to the given region. // Set the shape of the window to the given region.
// Returns true if the platform supports this feature (and the // Returns true if the platform supports this feature (and the

26
include/wx/window.h
View File

@@ -168,31 +168,11 @@ public:
// window attributes // window attributes
// ----------------- // -----------------
#if !defined(__WXMSW__) && \ // label is just the same as the title (but for, e.g., buttons it
!defined(__WXMGL__) && \ // makes more sense to speak about labels), title access
!defined(__WXMOTIF__) && \ // is available from wxTLW classes only (frames, dialogs)
!defined(__WXPM__) && \
!defined(__WXMAC__) && \
!defined(__WXCOCOA__) && \
!defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
// to wxTopLevelWindow so initially enabled in wxMSW only to observe results
// and continue on other platforms
virtual void SetTitle( const wxString& WXUNUSED(title) ) {}
virtual wxString GetTitle() const { return wxEmptyString; }
// label is just the same as the title (but for, e.g., buttons it
// makes more sense to speak about labels)
virtual void SetLabel(const wxString& label) { SetTitle(label); }
virtual wxString GetLabel() const { return GetTitle(); }
#else
// label is just the same as the title (but for, e.g., buttons it
// makes more sense to speak about labels)
virtual void SetLabel(const wxString& label) = 0; virtual void SetLabel(const wxString& label) = 0;
virtual wxString GetLabel() const = 0; virtual wxString GetLabel() const = 0;
#endif
// the window name is used for ressource setting in X, it is not the // the window name is used for ressource setting in X, it is not the
// same as the window title/label // same as the window title/label

9
include/wx/x11/toplevel.h
View File

@@ -46,15 +46,15 @@ public:
virtual ~wxTopLevelWindowX11(); virtual ~wxTopLevelWindowX11();
// implement base class pure virtuals // implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE); virtual void Maximize(bool maximize = true);
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE); virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
virtual void SetIcons(const wxIconBundle& icons); virtual void SetIcons(const wxIconBundle& icons);
virtual void Restore(); virtual void Restore();
virtual bool Show( bool show = TRUE ); virtual bool Show( bool show = true );
virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL ); virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual bool IsFullScreen() const { return m_fsIsShowing; }
@@ -63,7 +63,7 @@ public:
virtual wxString GetTitle() const; virtual wxString GetTitle() const;
// implementation // implementation
void SetNeedResizeInIdle( bool set = TRUE ) void SetNeedResizeInIdle( bool set = true )
{ m_needResizeInIdle = set; } { m_needResizeInIdle = set; }
void SetConfigureGeometry( int x, int y, int width, int height ) void SetConfigureGeometry( int x, int y, int width, int height )
{ m_x = x; m_y = y; m_width = width; m_height = height; } { m_x = x; m_y = y; m_width = width; m_height = height; }
@@ -115,4 +115,3 @@ protected:
//extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; //extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
#endif // _WX_X11_TOPLEVEL_H_ #endif // _WX_X11_TOPLEVEL_H_

26
include/wx/x11/window.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: window.h // Name: wx/x11/window.h
// Purpose: wxWindow class // Purpose: wxWindow class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -49,15 +49,18 @@ public:
virtual void Raise(); virtual void Raise();
virtual void Lower(); virtual void Lower();
virtual bool Show( bool show = TRUE ); virtual void SetLabel(const wxString& label);
virtual bool Enable( bool enable = TRUE ); virtual wxString GetLabel() const;
virtual bool Show( bool show = true );
virtual bool Enable( bool enable = true );
virtual void SetFocus(); virtual void SetFocus();
virtual void WarpPointer(int x, int y); virtual void WarpPointer(int x, int y);
virtual void Refresh( bool eraseBackground = TRUE, virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL ); const wxRect *rect = (const wxRect *) NULL );
virtual void Update(); virtual void Update();
virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetBackgroundColour( const wxColour &colour );
@@ -79,8 +82,8 @@ public:
const wxRect* rect = (wxRect *) NULL ); const wxRect* rect = (wxRect *) NULL );
virtual void DoSetSizeHints(int minW, int minH, virtual void DoSetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1, int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
int incW = -1, int incH = -1); int incW = wxDefaultCoord, int incH = wxDefaultCoord);
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
@@ -129,17 +132,17 @@ public:
// Return clear region // Return clear region
wxRegion &GetClearRegion() { return m_clearRegion; } wxRegion &GetClearRegion() { return m_clearRegion; }
void NeedUpdateNcAreaInIdle( bool update = TRUE ) { m_updateNcArea = update; } void NeedUpdateNcAreaInIdle( bool update = true ) { m_updateNcArea = update; }
// Inserting into main window instead of client // Inserting into main window instead of client
// window. This is mostly for a wxWindow's own // window. This is mostly for a wxWindow's own
// scrollbars. // scrollbars.
void SetInsertIntoMain( bool insert = TRUE ) { m_insertIntoMain = insert; } void SetInsertIntoMain( bool insert = true ) { m_insertIntoMain = insert; }
bool GetInsertIntoMain() { return m_insertIntoMain; } bool GetInsertIntoMain() { return m_insertIntoMain; }
// sets the fore/background colour for the given widget // sets the fore/background colour for the given widget
static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour); static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE); static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = false);
// I don't want users to override what's done in idle so everything that // I don't want users to override what's done in idle so everything that
// has to be done in idle time in order for wxX11 to work is done in // has to be done in idle time in order for wxX11 to work is done in
@@ -215,5 +218,4 @@ protected:
static int ms_count; static int ms_count;
}; };
#endif #endif // _WX_WINDOW_H_
// _WX_WINDOW_H_

76
src/x11/toplevel.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: x11/toplevel.cpp // Name: src/x11/toplevel.cpp
// Purpose: implements wxTopLevelWindow for X11 // Purpose: implements wxTopLevelWindow for X11
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -50,20 +50,20 @@ bool wxMWMIsRunning(Window w);
void wxTopLevelWindowX11::Init() void wxTopLevelWindowX11::Init()
{ {
m_iconized = m_iconized =
m_maximizeOnShow = FALSE; m_maximizeOnShow = false;
// unlike (almost?) all other windows, frames are created hidden // unlike (almost?) all other windows, frames are created hidden
m_isShown = FALSE; m_isShown = false;
// Data to save/restore when calling ShowFullScreen // Data to save/restore when calling ShowFullScreen
m_fsStyle = 0; m_fsStyle = 0;
m_fsIsMaximized = FALSE; m_fsIsMaximized = false;
m_fsIsShowing = FALSE; m_fsIsShowing = false;
m_needResizeInIdle = FALSE; m_needResizeInIdle = false;
m_x = -1; m_x = wxDefaultCoord;
m_y = -1; m_y = wxDefaultCoord;
m_width = 20; m_width = 20;
m_height = 20; m_height = 20;
} }
@@ -84,7 +84,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
SetName(name); SetName(name);
m_windowId = id == -1 ? NewControlId() : id; m_windowId = id == wxID_ANY ? NewControlId() : id;
if (parent) if (parent)
parent->AddChild(this); parent->AddChild(this);
@@ -102,7 +102,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
else else
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_backgroundColour.CalcPixel( (WXColormap) cm ); m_backgroundColour.CalcPixel( (WXColormap) cm );
m_hasBgCol = TRUE; m_hasBgCol = true;
m_x = pos.x; m_x = pos.x;
if (m_x < -1) if (m_x < -1)
@@ -236,7 +236,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
SetTitle(title); SetTitle(title);
return TRUE; return true;
} }
wxTopLevelWindowX11::~wxTopLevelWindowX11() wxTopLevelWindowX11::~wxTopLevelWindowX11()
@@ -269,7 +269,7 @@ void wxTopLevelWindowX11::OnInternalIdle()
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event ); GetEventHandler()->ProcessEvent( event );
m_needResizeInIdle = FALSE; m_needResizeInIdle = false;
} }
} }
@@ -286,7 +286,7 @@ bool wxTopLevelWindowX11::Show(bool show)
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
m_needResizeInIdle = FALSE; m_needResizeInIdle = false;
} }
bool ret = wxWindowX11::Show(show); bool ret = wxWindowX11::Show(show);
@@ -306,7 +306,7 @@ void wxTopLevelWindowX11::Maximize(bool maximize)
bool wxTopLevelWindowX11::IsMaximized() const bool wxTopLevelWindowX11::IsMaximized() const
{ {
// TODO // TODO
return TRUE; return true;
} }
void wxTopLevelWindowX11::Iconize(bool iconize) void wxTopLevelWindowX11::Iconize(bool iconize)
@@ -315,7 +315,7 @@ void wxTopLevelWindowX11::Iconize(bool iconize)
{ {
if (XIconifyWindow(wxGlobalDisplay(), if (XIconifyWindow(wxGlobalDisplay(),
(Window) GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0) (Window) GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0)
m_iconized = TRUE; m_iconized = true;
} }
} }
@@ -330,7 +330,7 @@ void wxTopLevelWindowX11::Restore()
if (m_iconized && GetMainWindow()) if (m_iconized && GetMainWindow())
{ {
XMapWindow(wxGlobalDisplay(), (Window) GetMainWindow()); XMapWindow(wxGlobalDisplay(), (Window) GetMainWindow());
m_iconized = FALSE; m_iconized = false;
} }
} }
@@ -343,24 +343,24 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
if (show) if (show)
{ {
if (IsFullScreen()) if (IsFullScreen())
return FALSE; return false;
m_fsIsShowing = TRUE; m_fsIsShowing = true;
m_fsStyle = style; m_fsStyle = style;
// TODO // TODO
return TRUE; return true;
} }
else else
{ {
if (!IsFullScreen()) if (!IsFullScreen())
return FALSE; return false;
m_fsIsShowing = FALSE; m_fsIsShowing = false;
// TODO // TODO
return TRUE; return true;
} }
} }
@@ -491,16 +491,16 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
int old_width = m_width; int old_width = m_width;
int old_height = m_height; int old_height = m_height;
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_x = x; m_x = x;
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_y = y; m_y = y;
if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (width != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_width = width; m_width = width;
if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (height != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
m_height = height; m_height = height;
if (m_x == old_x && m_y == old_y && m_width == old_width && m_height == old_height) if (m_x == old_x && m_y == old_y && m_width == old_width && m_height == old_height)
@@ -551,20 +551,20 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
windowChanges.stack_mode = 0; windowChanges.stack_mode = 0;
int valueMask = CWX | CWY | CWWidth | CWHeight; int valueMask = CWX | CWY | CWWidth | CWHeight;
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{ {
valueMask |= CWX; valueMask |= CWX;
} }
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{ {
valueMask |= CWY; valueMask |= CWY;
} }
if (width != -1) if (width != wxDefaultCoord)
{ {
windowChanges.width = wxMax(1, width); windowChanges.width = wxMax(1, width);
valueMask |= CWWidth; valueMask |= CWWidth;
} }
if (height != -1) if (height != wxDefaultCoord)
{ {
windowChanges.height = wxMax(1, height); windowChanges.height = wxMax(1, height);
valueMask |= CWHeight; valueMask |= CWHeight;
@@ -651,7 +651,7 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
#define MWM_INPUT_FULL_APPLICATION_MODAL 3 #define MWM_INPUT_FULL_APPLICATION_MODAL 3
#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
#define MWM_TEAROFF_WINDOW (1L<<0) #define MWM_TEAROFF_WINDOW (1L<<0)
#endif #endif
@@ -734,7 +734,7 @@ bool wxSetWMDecorations(Window w, long style)
Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False); Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
if (mwm_wm_hints == 0) if (mwm_wm_hints == 0)
return FALSE; return false;
MwmHints hints; MwmHints hints;
hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS; hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS;
@@ -779,13 +779,11 @@ bool wxSetWMDecorations(Window w, long style)
} }
XChangeProperty(wxGlobalDisplay(), XChangeProperty(wxGlobalDisplay(),
w, w,
mwm_wm_hints, mwm_wm_hints, mwm_wm_hints, mwm_wm_hints,
32, PropModeReplace, 32, PropModeReplace,
(unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS); (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
#endif #endif
return TRUE; return true;
} }

121
src/x11/window.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp // Name: src/x11/windows.cpp
// Purpose: wxWindow // Purpose: wxWindow
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -96,24 +96,24 @@ void wxWindowX11::Init()
// X11-specific // X11-specific
m_mainWindow = (WXWindow) 0; m_mainWindow = (WXWindow) 0;
m_clientWindow = (WXWindow) 0; m_clientWindow = (WXWindow) 0;
m_insertIntoMain = FALSE; m_insertIntoMain = false;
m_updateNcArea = FALSE; m_updateNcArea = false;
m_winCaptured = FALSE; m_winCaptured = false;
m_needsInputFocus = FALSE; m_needsInputFocus = false;
m_isShown = TRUE; m_isShown = true;
m_lastTS = 0; m_lastTS = 0;
m_lastButton = 0; m_lastButton = 0;
} }
// real construction (Init() must have been called before!) // real construction (Init() must have been called before!)
bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name) const wxString& name)
{ {
wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); wxCHECK_MSG( parent, false, wxT("can't create wxWindow without parent") );
CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
@@ -148,16 +148,16 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
size2.y = 20; size2.y = 20;
wxPoint pos2(pos); wxPoint pos2(pos);
if (pos2.x == -1) if (pos2.x == wxDefaultCoord)
pos2.x = 0; pos2.x = 0;
if (pos2.y == -1) if (pos2.y == wxDefaultCoord)
pos2.y = 0; pos2.y = 0;
#if wxUSE_TWO_WINDOWS #if wxUSE_TWO_WINDOWS
bool need_two_windows = bool need_two_windows =
((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0); ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
#else #else
bool need_two_windows = FALSE; bool need_two_windows = false;
#endif #endif
#if wxUSE_NANOX #if wxUSE_NANOX
@@ -314,7 +314,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
} }
// Is a subwindow, so map immediately // Is a subwindow, so map immediately
m_isShown = TRUE; m_isShown = true;
// Without this, the cursor may not be restored properly (e.g. in splitter // Without this, the cursor may not be restored properly (e.g. in splitter
// sample). // sample).
@@ -325,7 +325,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
// for example // for example
// SetSize(pos.x, pos.y, size.x, size.y); // SetSize(pos.x, pos.y, size.x, size.y);
return TRUE; return true;
} }
// Destructor // Destructor
@@ -336,7 +336,7 @@ wxWindowX11::~wxWindowX11()
if (g_captureWindow == this) if (g_captureWindow == this)
g_captureWindow = NULL; g_captureWindow = NULL;
m_isBeingDeleted = TRUE; m_isBeingDeleted = true;
DestroyChildren(); DestroyChildren();
@@ -385,11 +385,11 @@ void wxWindowX11::SetFocus()
wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName()); wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
// XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime ); // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime ); XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
m_needsInputFocus = FALSE; m_needsInputFocus = false;
} }
else else
{ {
m_needsInputFocus = TRUE; m_needsInputFocus = true;
} }
} }
@@ -419,9 +419,9 @@ wxWindow *wxWindowBase::DoFindFocus()
bool wxWindowX11::Enable(bool enable) bool wxWindowX11::Enable(bool enable)
{ {
if ( !wxWindowBase::Enable(enable) ) if ( !wxWindowBase::Enable(enable) )
return FALSE; return false;
return TRUE; return true;
} }
bool wxWindowX11::Show(bool show) bool wxWindowX11::Show(bool show)
@@ -441,7 +441,7 @@ bool wxWindowX11::Show(bool show)
XUnmapWindow(xdisp, xwindow); XUnmapWindow(xdisp, xwindow);
} }
return TRUE; return true;
} }
// Raise the window to the top of the Z order // Raise the window to the top of the Z order
@@ -458,11 +458,22 @@ void wxWindowX11::Lower()
XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow ); XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
} }
void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))
{
// TODO
}
wxString wxWindowX11::GetLabel() const
{
// TODO
return wxEmptyString;
}
void wxWindowX11::DoCaptureMouse() void wxWindowX11::DoCaptureMouse()
{ {
if ((g_captureWindow != NULL) && (g_captureWindow != this)) if ((g_captureWindow != NULL) && (g_captureWindow != this))
{ {
wxASSERT_MSG(FALSE, wxT("Trying to capture before mouse released.")); wxASSERT_MSG(false, wxT("Trying to capture before mouse released."));
// Core dump now // Core dump now
int *tmp = NULL; int *tmp = NULL;
@@ -502,7 +513,7 @@ void wxWindowX11::DoCaptureMouse()
return; return;
} }
m_winCaptured = TRUE; m_winCaptured = true;
} }
} }
@@ -522,7 +533,7 @@ void wxWindowX11::DoReleaseMouse()
// wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() ); // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
m_winCaptured = FALSE; m_winCaptured = false;
} }
bool wxWindowX11::SetFont(const wxFont& font) bool wxWindowX11::SetFont(const wxFont& font)
@@ -530,10 +541,10 @@ bool wxWindowX11::SetFont(const wxFont& font)
if ( !wxWindowBase::SetFont(font) ) if ( !wxWindowBase::SetFont(font) )
{ {
// nothing to do // nothing to do
return FALSE; return false;
} }
return TRUE; return true;
} }
bool wxWindowX11::SetCursor(const wxCursor& cursor) bool wxWindowX11::SetCursor(const wxCursor& cursor)
@@ -541,12 +552,12 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
if ( !wxWindowBase::SetCursor(cursor) ) if ( !wxWindowBase::SetCursor(cursor) )
{ {
// no change // no change
return FALSE; return false;
} }
Window xwindow = (Window) m_clientWindow; Window xwindow = (Window) m_clientWindow;
wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") ); wxCHECK_MSG( xwindow, false, wxT("invalid window") );
wxCursor cursorToUse; wxCursor cursorToUse;
if (m_cursor.Ok()) if (m_cursor.Ok())
@@ -558,7 +569,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
XDefineCursor( wxGlobalDisplay(), xwindow, xcursor ); XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );
return TRUE; return true;
} }
// Coordinates relative to the window // Coordinates relative to the window
@@ -727,7 +738,7 @@ void wxWindowX11::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
bool wxWindowX11::PreResize() bool wxWindowX11::PreResize()
{ {
return TRUE; return true;
} }
// Get total size // Get total size
@@ -838,25 +849,25 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int new_w = attr.width; int new_w = attr.width;
int new_h = attr.height; int new_h = attr.height;
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{ {
int yy = 0; int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags); AdjustForParentClientOrigin( x, yy, sizeFlags);
new_x = x; new_x = x;
} }
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{ {
int xx = 0; int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags); AdjustForParentClientOrigin( xx, y, sizeFlags);
new_y = y; new_y = y;
} }
if (width != -1) if (width != wxDefaultCoord)
{ {
new_w = width; new_w = width;
if (new_w <= 0) if (new_w <= 0)
new_w = 20; new_w = 20;
} }
if (height != -1) if (height != wxDefaultCoord)
{ {
new_h = height; new_h = height;
if (new_h <= 0) if (new_h <= 0)
@@ -1047,16 +1058,16 @@ int wxWindowX11::GetCharWidth() const
} }
void wxWindowX11::GetTextExtent(const wxString& string, void wxWindowX11::GetTextExtent(const wxString& string,
int *x, int *y, int *x, int *y,
int *descent, int *externalLeading, int *descent, int *externalLeading,
const wxFont *theFont) const const wxFont *theFont) const
{ {
wxFont fontToUse = GetFont(); wxFont fontToUse = GetFont();
if (theFont) fontToUse = *theFont; if (theFont) fontToUse = *theFont;
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
if (string.IsEmpty()) if (string.empty())
{ {
if (x) (*x) = 0; if (x) (*x) = 0;
if (y) (*y) = 0; if (y) (*y) = 0;
@@ -1201,7 +1212,7 @@ void wxWindowX11::SendPaintEvents()
{ {
// wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId()); // wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());
m_clipPaintRegion = TRUE; m_clipPaintRegion = true;
wxPaintEvent paint_event( GetId() ); wxPaintEvent paint_event( GetId() );
paint_event.SetEventObject( this ); paint_event.SetEventObject( this );
@@ -1209,7 +1220,7 @@ void wxWindowX11::SendPaintEvents()
m_updateRegion.Clear(); m_updateRegion.Clear();
m_clipPaintRegion = FALSE; m_clipPaintRegion = false;
} }
void wxWindowX11::SendNcPaintEvents() void wxWindowX11::SendNcPaintEvents()
@@ -1249,7 +1260,7 @@ void wxWindowX11::SendNcPaintEvents()
nc_paint_event.SetEventObject( this ); nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event ); GetEventHandler()->ProcessEvent( nc_paint_event );
m_updateNcArea = FALSE; m_updateNcArea = false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1300,7 +1311,7 @@ void wxWindowX11::OnInternalIdle()
// If it couldn't set the focus now, there's // If it couldn't set the focus now, there's
// no point in trying again. // no point in trying again.
m_needsInputFocus = FALSE; m_needsInputFocus = false;
} }
g_GettingFocus = NULL; g_GettingFocus = NULL;
} }
@@ -1315,13 +1326,13 @@ static bool DoAddWindowToTable(wxWindowHash *hash, Window w, wxWindow *win)
{ {
wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"), wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"),
(unsigned int)w, win->GetClassInfo()->GetClassName()); (unsigned int)w, win->GetClassInfo()->GetClassName());
return FALSE; return false;
} }
wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"), wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
(unsigned int) w, win, win->GetClassInfo()->GetClassName()); (unsigned int) w, win, win->GetClassInfo()->GetClassName());
return TRUE; return true;
} }
static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w) static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w)
@@ -1478,11 +1489,11 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
{ {
eventType = wxEVT_RIGHT_UP; eventType = wxEVT_RIGHT_UP;
} }
else return FALSE; else return false;
} }
else else
{ {
return FALSE; return false;
} }
wxevent.SetEventType(eventType); wxevent.SetEventType(eventType);
@@ -1508,10 +1519,10 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
wxevent.SetId(win->GetId()); wxevent.SetId(win->GetId());
wxevent.SetEventObject(win); wxevent.SetEventObject(win);
return TRUE; return true;
} }
} }
return FALSE; return false;
} }
bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii) bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii)
@@ -1551,7 +1562,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win
default: default:
break; break;
} }
return FALSE; return false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1572,15 +1583,15 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
// the background ourselves. // the background ourselves.
// XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() ); // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );
return TRUE; return true;
} }
bool wxWindowX11::SetForegroundColour(const wxColour& col) bool wxWindowX11::SetForegroundColour(const wxColour& col)
{ {
if ( !wxWindowBase::SetForegroundColour(col) ) if ( !wxWindowBase::SetForegroundColour(col) )
return FALSE; return false;
return TRUE; return true;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1662,7 +1673,7 @@ bool wxWinModule::OnInit()
g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL ); g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
XSetFillStyle( xdisplay, g_eraseGC, FillSolid ); XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
return TRUE; return true;
} }
void wxWinModule::OnExit() void wxWinModule::OnExit()
@@ -1670,5 +1681,3 @@ void wxWinModule::OnExit()
Display *xdisplay = wxGlobalDisplay(); Display *xdisplay = wxGlobalDisplay();
XFreeGC( xdisplay, g_eraseGC ); XFreeGC( xdisplay, g_eraseGC );
} }