cleaned a bit of mess in wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -7,8 +7,6 @@
|
|||||||
#include "wx/motif/mdi.h"
|
#include "wx/motif/mdi.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
#include "wx/gtk/mdi.h"
|
#include "wx/gtk/mdi.h"
|
||||||
#elif defined(__WXX11__)
|
|
||||||
#include "wx/x11/mdi.h"
|
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
#include "wx/mac/mdi.h"
|
#include "wx/mac/mdi.h"
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
|
|||||||
@@ -43,8 +43,6 @@
|
|||||||
#include "wx/motif/toolbar.h"
|
#include "wx/motif/toolbar.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
#include "wx/gtk/tbargtk.h"
|
#include "wx/gtk/tbargtk.h"
|
||||||
#elif defined(__WXX11__)
|
|
||||||
#include "wx/x11/toolbar.h"
|
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
#include "wx/mac/toolbar.h"
|
#include "wx/mac/toolbar.h"
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
|
|||||||
@@ -1,250 +0,0 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Name: mdi.h
|
|
||||||
// Purpose: MDI (Multiple Document Interface) classes.
|
|
||||||
// Author: Julian Smart
|
|
||||||
// Modified by:
|
|
||||||
// Created: 17/09/98
|
|
||||||
// RCS-ID: $Id$
|
|
||||||
// Copyright: (c) Julian Smart
|
|
||||||
// Licence: wxWindows licence
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#ifndef _WX_MDI_H_
|
|
||||||
#define _WX_MDI_H_
|
|
||||||
|
|
||||||
#ifdef __GNUG__
|
|
||||||
#pragma interface "mdi.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
New MDI scheme using tabs. We can use a wxNotebook to implement the client
|
|
||||||
window. wxMDIChildFrame can be implemented as an XmMainWindow widget
|
|
||||||
as before, and is a child of the notebook _and_ of the parent frame...
|
|
||||||
but wxMDIChildFrame::GetParent should return the parent frame.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "wx/frame.h"
|
|
||||||
#include "wx/notebook.h"
|
|
||||||
|
|
||||||
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
|
|
||||||
WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxMDIClientWindow;
|
|
||||||
class WXDLLEXPORT wxMDIChildFrame;
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxMDIParentFrame: public wxFrame
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
|
|
||||||
|
|
||||||
friend class WXDLLEXPORT wxMDIChildFrame;
|
|
||||||
public:
|
|
||||||
|
|
||||||
wxMDIParentFrame();
|
|
||||||
inline wxMDIParentFrame(wxWindow *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxString& title,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, // Scrolling refers to client window
|
|
||||||
const wxString& name = wxFrameNameStr)
|
|
||||||
{
|
|
||||||
Create(parent, id, title, pos, size, style, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
~wxMDIParentFrame();
|
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxString& title,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
|
|
||||||
const wxString& name = wxFrameNameStr);
|
|
||||||
|
|
||||||
void OnSize(wxSizeEvent& event);
|
|
||||||
void OnActivate(wxActivateEvent& event);
|
|
||||||
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
|
||||||
void OnMenuHighlight(wxMenuEvent& event);
|
|
||||||
|
|
||||||
void SetMenuBar(wxMenuBar *menu_bar);
|
|
||||||
|
|
||||||
// Get the active MDI child window
|
|
||||||
wxMDIChildFrame *GetActiveChild() const ;
|
|
||||||
|
|
||||||
// Get the client window
|
|
||||||
wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
|
|
||||||
|
|
||||||
// Create the client window class (don't Create the window,
|
|
||||||
// just return a new class)
|
|
||||||
virtual wxMDIClientWindow *OnCreateClient() ;
|
|
||||||
|
|
||||||
// MDI operations
|
|
||||||
virtual void Cascade();
|
|
||||||
virtual void Tile();
|
|
||||||
virtual void ArrangeIcons();
|
|
||||||
virtual void ActivateNext();
|
|
||||||
virtual void ActivatePrevious();
|
|
||||||
|
|
||||||
// Implementation
|
|
||||||
|
|
||||||
// Set the active child
|
|
||||||
inline void SetActiveChild(wxMDIChildFrame* child) { m_activeChild = child; }
|
|
||||||
|
|
||||||
// Set the child's menubar into the parent frame
|
|
||||||
void SetChildMenuBar(wxMDIChildFrame* frame);
|
|
||||||
|
|
||||||
inline wxMenuBar* GetActiveMenuBar() const { return m_activeMenuBar; }
|
|
||||||
|
|
||||||
// Redirect events to active child first
|
|
||||||
virtual bool ProcessEvent(wxEvent& event);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual void DoSetSize(int x, int y,
|
|
||||||
int width, int height,
|
|
||||||
int sizeFlags = wxSIZE_AUTO);
|
|
||||||
virtual void DoSetClientSize(int width, int height);
|
|
||||||
|
|
||||||
// Gets the size available for subwindows after menu size, toolbar size
|
|
||||||
// and status bar size have been subtracted. If you want to manage your own
|
|
||||||
// toolbar(s), don't call SetToolBar.
|
|
||||||
void DoGetClientSize(int *width, int *height) const;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
wxMDIClientWindow* m_clientWindow;
|
|
||||||
wxMDIChildFrame* m_activeChild;
|
|
||||||
wxMenuBar* m_activeMenuBar;
|
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
};
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxMDIChildFrame: public wxFrame
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
|
|
||||||
|
|
||||||
public:
|
|
||||||
wxMDIChildFrame();
|
|
||||||
wxMDIChildFrame(wxMDIParentFrame *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxString& title,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxDEFAULT_FRAME_STYLE,
|
|
||||||
const wxString& name = wxFrameNameStr)
|
|
||||||
{
|
|
||||||
Create(parent, id, title, pos, size, style, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
~wxMDIChildFrame();
|
|
||||||
|
|
||||||
bool Create(wxMDIParentFrame *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxString& title,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxDEFAULT_FRAME_STYLE,
|
|
||||||
const wxString& name = wxFrameNameStr);
|
|
||||||
|
|
||||||
// Set menu bar
|
|
||||||
void SetMenuBar(wxMenuBar *menu_bar);
|
|
||||||
void SetTitle(const wxString& title);
|
|
||||||
|
|
||||||
// Set icon
|
|
||||||
virtual void SetIcon(const wxIcon& icon);
|
|
||||||
|
|
||||||
// Override wxFrame operations
|
|
||||||
void CaptureMouse();
|
|
||||||
void ReleaseMouse();
|
|
||||||
void Raise();
|
|
||||||
void Lower(void);
|
|
||||||
void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
|
|
||||||
|
|
||||||
// MDI operations
|
|
||||||
virtual void Maximize();
|
|
||||||
virtual void Maximize(bool WXUNUSED(maximize)) { };
|
|
||||||
inline void Minimize() { Iconize(TRUE); };
|
|
||||||
virtual void Iconize(bool iconize);
|
|
||||||
virtual void Restore();
|
|
||||||
virtual void Activate();
|
|
||||||
virtual bool IsIconized() const ;
|
|
||||||
|
|
||||||
virtual bool IsTopLevel() const { return FALSE; }
|
|
||||||
|
|
||||||
// Is the frame maximized? Returns TRUE for
|
|
||||||
// wxMDIChildFrame due to the tabbed implementation.
|
|
||||||
virtual bool IsMaximized(void) const ;
|
|
||||||
|
|
||||||
bool Show(bool show);
|
|
||||||
|
|
||||||
WXWidget GetMainWidget() const { return m_mainWidget; };
|
|
||||||
WXWidget GetTopWidget() const { return m_mainWidget; };
|
|
||||||
WXWidget GetClientWidget() const { return m_mainWidget; };
|
|
||||||
|
|
||||||
/*
|
|
||||||
virtual void OnRaise();
|
|
||||||
virtual void OnLower();
|
|
||||||
*/
|
|
||||||
|
|
||||||
void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
|
|
||||||
wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
|
|
||||||
|
|
||||||
protected:
|
|
||||||
wxMDIParentFrame* m_mdiParentFrame;
|
|
||||||
|
|
||||||
virtual void DoSetSize(int x, int y,
|
|
||||||
int width, int height,
|
|
||||||
int sizeFlags = wxSIZE_AUTO);
|
|
||||||
virtual void DoSetClientSize(int width, int height);
|
|
||||||
|
|
||||||
void DoGetClientSize(int *width, int *height) const;
|
|
||||||
void DoGetSize(int *width, int *height) const;
|
|
||||||
void DoGetPosition(int *x, int *y) const ;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* The client window is a child of the parent MDI frame, and itself
|
|
||||||
* contains the child MDI frames.
|
|
||||||
* However, you create the MDI children as children of the MDI parent:
|
|
||||||
* only in the implementation does the client window become the parent
|
|
||||||
* of the children. Phew! So the children are sort of 'adopted'...
|
|
||||||
*/
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
|
|
||||||
|
|
||||||
public:
|
|
||||||
wxMDIClientWindow() ;
|
|
||||||
wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
|
|
||||||
{
|
|
||||||
CreateClient(parent, style);
|
|
||||||
}
|
|
||||||
|
|
||||||
~wxMDIClientWindow();
|
|
||||||
|
|
||||||
// Note: this is virtual, to allow overridden behaviour.
|
|
||||||
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
|
||||||
|
|
||||||
// Explicitly call default scroll behaviour
|
|
||||||
void OnScroll(wxScrollEvent& event);
|
|
||||||
|
|
||||||
// Implementation
|
|
||||||
void OnPageChanged(wxNotebookEvent& event);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual void DoSetSize(int x, int y,
|
|
||||||
int width, int height,
|
|
||||||
int sizeFlags = wxSIZE_AUTO);
|
|
||||||
virtual void DoSetClientSize(int width, int height);
|
|
||||||
|
|
||||||
void DoGetClientSize(int *width, int *height) const;
|
|
||||||
void DoGetSize(int *width, int *height) const ;
|
|
||||||
void DoGetPosition(int *x, int *y) const ;
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// _WX_MDI_H_
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Name: wx/motif/toolbar.h
|
|
||||||
// Purpose: wxToolBar class
|
|
||||||
// Author: Julian Smart
|
|
||||||
// Modified by: 13.12.99 by VZ during toolbar classes reorganization
|
|
||||||
// Created: 17/09/98
|
|
||||||
// RCS-ID: $Id$
|
|
||||||
// Copyright: (c) Julian Smart
|
|
||||||
// Licence: wxWindows licence
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#ifndef _WX_TOOLBAR_H_
|
|
||||||
#define _WX_TOOLBAR_H_
|
|
||||||
|
|
||||||
#ifdef __GNUG__
|
|
||||||
#pragma interface "toolbar.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxToolBar : public wxToolBarBase
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
// ctors and dtor
|
|
||||||
wxToolBar() { Init(); }
|
|
||||||
|
|
||||||
wxToolBar(wxWindow *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
|
||||||
const wxString& name = wxToolBarNameStr)
|
|
||||||
{
|
|
||||||
Init();
|
|
||||||
|
|
||||||
Create(parent, id, pos, size, style, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
|
||||||
wxWindowID id,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
|
||||||
const wxString& name = wxToolBarNameStr);
|
|
||||||
|
|
||||||
virtual ~wxToolBar();
|
|
||||||
|
|
||||||
// override/implement base class virtuals
|
|
||||||
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
|
|
||||||
|
|
||||||
virtual bool Realize();
|
|
||||||
|
|
||||||
// implementation from now on
|
|
||||||
|
|
||||||
// find tool by widget
|
|
||||||
wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
// common part of all ctors
|
|
||||||
void Init();
|
|
||||||
|
|
||||||
// implement base class pure virtuals
|
|
||||||
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
|
|
||||||
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
|
|
||||||
|
|
||||||
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
|
|
||||||
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
|
|
||||||
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
|
|
||||||
|
|
||||||
virtual wxToolBarToolBase *CreateTool(int id,
|
|
||||||
const wxBitmap& bitmap1,
|
|
||||||
const wxBitmap& bitmap2,
|
|
||||||
bool toggle,
|
|
||||||
wxObject *clientData,
|
|
||||||
const wxString& shortHelpString,
|
|
||||||
const wxString& longHelpString);
|
|
||||||
virtual wxToolBarToolBase *CreateTool(wxControl *control);
|
|
||||||
|
|
||||||
private:
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxToolBar)
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// _WX_TOOLBAR_H_
|
|
||||||
Reference in New Issue
Block a user