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

cleanup in wxMGL code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-30 23:30:51 +00:00
parent 253293c103
commit 580616706f
9 changed files with 113 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mgl/app.h
View File

@@ -24,6 +24,7 @@
class WXDLLEXPORT wxApp;
class WXDLLEXPORT wxLog;
class WXDLLEXPORT wxEventLoop;
class WXDLLEXPORT wxDesktopWindow;
//-----------------------------------------------------------------------------
// wxApp

120
include/wx/mgl/dialog.h
View File

@@ -1,120 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dialog.h
// Purpose:
// Author: Robert Roebling
// Created:
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKDIALOGH__
#define __GTKDIALOGH__
#ifdef __GNUG__
#pragma interface "dialog.h"
#endif
#include "wx/defs.h"
#include "wx/panel.h"
#include "wx/icon.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxDialog;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
//FIXME_MGL - belongs to wXUniv
extern const wxChar *wxDialogNameStr;
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
class wxDialog: public wxDialogBase
{
public:
wxDialog() { Init(); }
wxDialog( wxWindow *parent, wxWindowID id,
const wxString &title,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ) {}
bool Create( wxWindow *parent, wxWindowID id,
const wxString &title,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ) {}
~wxDialog() {}
void SetTitle(const wxString& title){}
wxString GetTitle() const {}
void OnApply( wxCommandEvent &event ) {}
void OnCancel( wxCommandEvent &event ) {}
void OnOK( wxCommandEvent &event ) {}
void OnPaint( wxPaintEvent& event ) {}
void OnSize( wxSizeEvent &event ) {}
void OnCloseWindow( wxCloseEvent& event ) {}
/*
void OnCharHook( wxKeyEvent& event );
*/
bool Destroy() {}
virtual bool Show( bool show ) {}
virtual int ShowModal() {}
virtual void EndModal( int retCode ) {}
virtual bool IsModal() const {}
void SetModal( bool modal ) {}
virtual void InitDialog(void) {}
virtual void SetIcon( const wxIcon &icon ) {}
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized() const { return FALSE; }
bool Iconized() const { return IsIconized(); }
virtual void Maximize() { }
virtual void Restore() { }
virtual bool IsTopLevel() const { return TRUE; }
// implementation
// --------------
// move the window to the specified location and resize it: this is called
// from both DoSetSize() and DoSetClientSize()
virtual void DoMoveWindow(int x, int y, int width, int height) {}
virtual void GtkOnSize( int x, int y, int width, int height ) {}
virtual void OnInternalIdle() {}
bool m_modalShowing;
wxString m_title;
wxIcon m_icon;
protected:
// common part of all ctors
void Init() {}
// common part of Destroy() and ~wxDialog
void CleanUp() {}
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO) {}
private:
// DECLARE_EVENT_TABLE() FIXME_MGL
DECLARE_DYNAMIC_CLASS(wxDialog)
};
#endif // __GTKDIALOGH__

132
include/wx/mgl/frame.h
View File

@@ -1,132 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/frame.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MGL_FRAME_H__
#define __MGL_FRAME_H__
#ifdef __GNUG__
#pragma interface "frame.h"
#endif
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxMDIChildFrame;
class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxToolBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxFrameMGL;
//-----------------------------------------------------------------------------
// wxFrame
//-----------------------------------------------------------------------------
//FIXME_MGL
class WXDLLEXPORT wxFrameMGL : public wxFrameBase
{
public:
// construction
wxFrameMGL() { Init(); }
wxFrameMGL(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) {}
virtual ~wxFrameMGL() {}
// implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE) {}
virtual bool IsMaximized() const {}
virtual void Iconize(bool iconize = TRUE) {}
virtual bool IsIconized() const {}
virtual void SetIcon(const wxIcon& icon) {}
virtual void MakeModal(bool modal = TRUE) {}
virtual void Restore() {}
#if wxUSE_MENUS
virtual void SetMenuBar( wxMenuBar *menuBar ) {}
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
virtual void PositionStatusBar() {}
virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxST_SIZEGRIP,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr) {}
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr) {}
void SetToolBar(wxToolBar *toolbar) {}
#endif // wxUSE_TOOLBAR
virtual bool Show(bool show = TRUE) {}
virtual void SetTitle( const wxString &title ) {}
virtual wxString GetTitle() const { return m_title; }
// implementation from now on
// --------------------------
// move the window to the specified location and resize it: this is called
// from both DoSetSize() and DoSetClientSize()
virtual void DoMoveWindow(int x, int y, int width, int height) {}
// GTK callbacks
virtual void GtkOnSize( int x, int y, int width, int height ) {}
virtual void OnInternalIdle() {}
wxString m_title;
int m_miniEdge,
m_miniTitle;
bool m_menuBarDetached;
bool m_toolBarDetached;
bool m_insertInClientArea; /* not from within OnCreateXXX */
protected:
// common part of all ctors
void Init() {}
// override wxWindow methods to take into account tool/menu/statusbars
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO) {}
virtual void DoSetClientSize(int width, int height) {}
virtual void DoGetClientSize( int *width, int *height ) const {}
private:
DECLARE_DYNAMIC_CLASS(wxFrameMGL)
};
#endif // __WX_FRAME_H__

3
include/wx/mgl/private.h
View File

@@ -49,7 +49,4 @@ public:
};
extern bool wxCreateMGL_WM();
extern void wxDestroyMGL_WM();
#endif // _WX_PRIVATE_H_

2
include/wx/mgl/window.h
View File

@@ -102,6 +102,8 @@ public:
#endif // WXWIN_COMPATIBILITY
virtual WXWidget GetHandle() const { return m_wnd; }
void SetMGLwindow_t(struct window_t *wnd);
// implementation from now on
// --------------------------