projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected/removed forward declarations
[wxWidgets.git]
/
include
/
wx
/
generic
/
mdig.h
diff --git
a/include/wx/generic/mdig.h
b/include/wx/generic/mdig.h
index 467bddfef46359c55e7a444fcbe38913e237784c..11f75518b6c813094b9ee09f2bf82491e1d41121 100644
(file)
--- a/
include/wx/generic/mdig.h
+++ b/
include/wx/generic/mdig.h
@@
-12,10
+12,6
@@
#ifndef _WX_MDIG_H_
#define _WX_MDIG_H_
#ifndef _WX_MDIG_H_
#define _WX_MDIG_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "mdig.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
@@
-24,17
+20,16
@@
#include "wx/panel.h"
#include "wx/notebook.h"
#include "wx/panel.h"
#include "wx/notebook.h"
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxGenericMDIParentFrame;
-class WXDLL
EXPORT
wxGenericMDIClientWindow;
-class WXDLL
EXPORT
wxGenericMDIChildFrame;
+class WXDLL
IMPEXP_FWD_CORE
wxGenericMDIParentFrame;
+class WXDLL
IMPEXP_FWD_CORE
wxGenericMDIClientWindow;
+class WXDLL
IMPEXP_FWD_CORE
wxGenericMDIChildFrame;
//-----------------------------------------------------------------------------
// wxGenericMDIParentFrame
//-----------------------------------------------------------------------------
// wxGenericMDIParentFrame
@@
-45,16
+40,16
@@
class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
public:
wxGenericMDIParentFrame();
wxGenericMDIParentFrame(wxWindow *parent,
public:
wxGenericMDIParentFrame();
wxGenericMDIParentFrame(wxWindow *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr);
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr);
- ~wxGenericMDIParentFrame();
+
virtual
~wxGenericMDIParentFrame();
bool Create( wxWindow *parent,
bool Create( wxWindow *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@
-79,7
+74,7
@@
public:
virtual wxGenericMDIClientWindow *OnCreateClient();
virtual void Cascade() { /* Has no effect */ }
virtual wxGenericMDIClientWindow *OnCreateClient();
virtual void Cascade() { /* Has no effect */ }
- virtual void Tile(
) { /* Has no effect */
}
+ virtual void Tile(
wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {
}
virtual void ArrangeIcons() { /* Has no effect */ }
virtual void ActivateNext();
virtual void ActivatePrevious();
virtual void ArrangeIcons() { /* Has no effect */ }
virtual void ActivateNext();
virtual void ActivatePrevious();
@@
-118,7
+113,7
@@
class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
public:
wxGenericMDIChildFrame();
wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
public:
wxGenericMDIChildFrame();
wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@
-127,7
+122,7
@@
public:
virtual ~wxGenericMDIChildFrame();
bool Create( wxGenericMDIParentFrame *parent,
virtual ~wxGenericMDIChildFrame();
bool Create( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@
-148,7
+143,7
@@
public:
// no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
long WXUNUSED(style) = 1,
// no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
long WXUNUSED(style) = 1,
- wxWindowID WXUNUSED(id) = 1,
+ wxWindowID WXUNUSED(
win
id) = 1,
const wxString& WXUNUSED(name) = wxEmptyString)
{ return (wxStatusBar*)NULL; }
const wxString& WXUNUSED(name) = wxEmptyString)
{ return (wxStatusBar*)NULL; }
@@
-157,37
+152,28
@@
public:
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
#endif
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
#endif
- // no size hints
- virtual void SetSizeHints( int WXUNUSED(minW),
- int WXUNUSED(minH),
- int WXUNUSED(maxW) = -1,
- int WXUNUSED(maxH) = -1,
- int WXUNUSED(incW) = -1,
- int WXUNUSED(incH) = -1) {}
-
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
- wxWindowID WXUNUSED(id),
+ wxWindowID WXUNUSED(
win
id),
const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
#endif
// no icon
const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
#endif
// no icon
- void SetIcon( const wxIcon &icon ) { /*m_icons = wxIconBundle( icon );*/}
- void SetIcons( const wxIconBundle &icons ) { /*m_icons = icons;*/ }
+ virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
// no maximize etc
// no maximize etc
- virtual void Maximize( bool WXUNUSED(maximize) =
TRUE
) { /* Has no effect */ }
+ virtual void Maximize( bool WXUNUSED(maximize) =
true
) { /* Has no effect */ }
virtual void Restore() { /* Has no effect */ }
virtual void Restore() { /* Has no effect */ }
- virtual void Iconize(bool WXUNUSED(iconize) =
TRUE
) { /* Has no effect */ }
- virtual bool IsMaximized() const { return
TRUE
; }
- virtual bool IsIconized() const { return
FALSE
; }
- virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return
FALSE
; }
- virtual bool IsFullScreen() const { return
FALSE
; }
+ virtual void Iconize(bool WXUNUSED(iconize) =
true
) { /* Has no effect */ }
+ virtual bool IsMaximized() const { return
true
; }
+ virtual bool IsIconized() const { return
false
; }
+ virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return
false
; }
+ virtual bool IsFullScreen() const { return
false
; }
- virtual bool IsTopLevel() const { return
FALSE
; }
+ virtual bool IsTopLevel() const { return
false
; }
void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event);
void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event);
@@
-213,6
+199,11
@@
protected:
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoMoveWindow(int x, int y, int width, int height);
+ // no size hints
+ virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+ int WXUNUSED(maxW), int WXUNUSED(maxH),
+ int WXUNUSED(incW), int WXUNUSED(incH)) {}
+
// This function needs to be called when a size change is confirmed,
// we needed this function to prevent any body from the outside
// changing the panel... it messes the UI layout when we would allow it.
// This function needs to be called when a size change is confirmed,
// we needed this function to prevent any body from the outside
// changing the panel... it messes the UI layout when we would allow it.
@@
-234,10
+225,10
@@
class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
public:
wxGenericMDIClientWindow();
wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
public:
wxGenericMDIClientWindow();
wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
- ~wxGenericMDIClientWindow();
+
virtual
~wxGenericMDIClientWindow();
virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
- virtual int SetSelection(
in
t nPage);
+ virtual int SetSelection(
size_
t nPage);
protected:
void PageChanged(int OldSelection, int newSelection);
protected:
void PageChanged(int OldSelection, int newSelection);
@@
-256,7
+247,7
@@
private:
*/
#ifndef wxUSE_GENERIC_MDI_AS_NATIVE
*/
#ifndef wxUSE_GENERIC_MDI_AS_NATIVE
-#if defined(__WXUNIVERSAL__) || defined(__WXPM__)
+#if defined(__WXUNIVERSAL__) || defined(__WXPM__)
|| defined(__WXCOCOA__)
#define wxUSE_GENERIC_MDI_AS_NATIVE 1
#else
#define wxUSE_GENERIC_MDI_AS_NATIVE 0
#define wxUSE_GENERIC_MDI_AS_NATIVE 1
#else
#define wxUSE_GENERIC_MDI_AS_NATIVE 0
@@
-265,6
+256,8
@@
private:
#if wxUSE_GENERIC_MDI_AS_NATIVE
#if wxUSE_GENERIC_MDI_AS_NATIVE
+class wxMDIChildFrame ;
+
//-----------------------------------------------------------------------------
// wxMDIParentFrame
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxMDIParentFrame
//-----------------------------------------------------------------------------
@@
-274,15
+267,18
@@
class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
public:
wxMDIParentFrame() {}
wxMDIParentFrame(wxWindow *parent,
public:
wxMDIParentFrame() {}
wxMDIParentFrame(wxWindow *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr)
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr)
- :wxGenericMDIParentFrame(parent, id, title, pos, size, style, name)
- {
- }
+ :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
+ {
+ }
+
+ wxMDIChildFrame * GetActiveChild() const ;
+
private:
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
private:
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
@@
-298,16
+294,15
@@
public:
wxMDIChildFrame() {}
wxMDIChildFrame( wxGenericMDIParentFrame *parent,
wxMDIChildFrame() {}
wxMDIChildFrame( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID
win
id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr )
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr )
- :wxGenericMDIChildFrame(parent, id, title, pos, size, style, name)
- {
- }
-
+ :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
+ {
+ }
private:
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
};
private:
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
};