activating ustring again

[wxWidgets.git] / include / wx / motif / mdi.h

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 9fc284d3957ed77b4e5c785c7dc7268f5ec2ef36..8d8ab5f2ad9ebfbd7d5a7693581529a5311fc031 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.h
+// Name:        wx/motif/mdi.h

 // Purpose:     MDI (Multiple Document Interface) classes.
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 /*
 New MDI scheme using tabs. We can use a wxNotebook to implement the client
 window. wxMDIChildFrame can be implemented as an XmMainWindow widget


@@ -27,19 +23,16 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 #include "wx/frame.h"
 #include "wx/notebook.h"
 
 #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 WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 
 

-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

-        
-        friend class WXDLLEXPORT wxMDIChildFrame;
+
+        friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 public:
 public:

-    
+

     wxMDIParentFrame();
     inline wxMDIParentFrame(wxWindow *parent,
         wxWindowID id,
     wxMDIParentFrame();
     inline wxMDIParentFrame(wxWindow *parent,
         wxWindowID id,


@@ -51,9 +44,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
     {
         Create(parent, id, title, pos, size, style, name);
     }

-    
-    ~wxMDIParentFrame();
-    
+
+    virtual ~wxMDIParentFrame();
+

     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxString& title,
     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxString& title,


@@ -61,68 +54,68 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
         const wxString& name = wxFrameNameStr);
         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 OnSize(wxSizeEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);

-    
+

     void SetMenuBar(wxMenuBar *menu_bar);
     void SetMenuBar(wxMenuBar *menu_bar);

-    
+

     // Get the active MDI child window
     wxMDIChildFrame *GetActiveChild() const ;
     // Get the active MDI child window
     wxMDIChildFrame *GetActiveChild() const ;

-    
+

     // Get the client window
     wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
     // 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() ;
     // Create the client window class (don't Create the window,
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient() ;

-    
+

     // MDI operations
     virtual void Cascade();
     // MDI operations
     virtual void Cascade();

-    virtual void Tile();
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL);

     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();

-    
+

     // Implementation
     // Implementation

-    
+

     // Set the active child
     inline void SetActiveChild(wxMDIChildFrame* child) { m_activeChild = child; }
     // 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);
     // Set the child's menubar into the parent frame
     void SetChildMenuBar(wxMDIChildFrame* frame);

-    
+

     inline wxMenuBar* GetActiveMenuBar() const { return m_activeMenuBar; }
     inline wxMenuBar* GetActiveMenuBar() const { return m_activeMenuBar; }

-    
+

     // Redirect events to active child first
     virtual bool ProcessEvent(wxEvent& event);
     // 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);
 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;
     // 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:
 protected:

-    
+

     wxMDIClientWindow*    m_clientWindow;
     wxMDIChildFrame*      m_activeChild;
     wxMenuBar*            m_activeMenuBar;
     wxMDIClientWindow*    m_clientWindow;
     wxMDIChildFrame*      m_activeChild;
     wxMenuBar*            m_activeMenuBar;

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)

-        
+

 public:
     wxMDIChildFrame();
     wxMDIChildFrame(wxMDIParentFrame *parent,
 public:
     wxMDIChildFrame();
     wxMDIChildFrame(wxMDIParentFrame *parent,


@@ -135,9 +128,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
     {
         Create(parent, id, title, pos, size, style, name);
     }

-    
-    ~wxMDIChildFrame();
-    
+
+    virtual ~wxMDIChildFrame();
+

     bool Create(wxMDIParentFrame *parent,
         wxWindowID id,
         const wxString& title,
     bool Create(wxMDIParentFrame *parent,
         wxWindowID id,
         const wxString& title,


@@ -145,11 +138,11 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE,
         const wxString& name = wxFrameNameStr);
         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 menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     void SetTitle(const wxString& title);

-    
+

     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );


@@ -159,48 +152,50 @@ public:
     void ReleaseMouse();
     void Raise();
     void Lower(void);
     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)) { };
     // MDI operations
     virtual void Maximize();
     virtual void Maximize(bool WXUNUSED(maximize)) { };

-    inline void Minimize() { Iconize(TRUE); };
+    inline void Minimize() { Iconize(true); };

     virtual void Iconize(bool iconize);
     virtual void Restore();
     virtual void Activate();
     virtual bool IsIconized() const ;
     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
+
+    virtual bool IsTopLevel() const { return false; }
+
+    // Is the frame maximized? Returns true for

     // wxMDIChildFrame due to the tabbed implementation.
     virtual bool IsMaximized(void) const ;
     // wxMDIChildFrame due to the tabbed implementation.
     virtual bool IsMaximized(void) const ;

-    
+

     bool Show(bool show);
     bool Show(bool show);

-    
+

     WXWidget GetMainWidget() const { return m_mainWidget; };
     WXWidget GetTopWidget() const { return m_mainWidget; };
     WXWidget GetClientWidget() const { return m_mainWidget; };
     WXWidget GetMainWidget() const { return m_mainWidget; };
     WXWidget GetTopWidget() const { return m_mainWidget; };
     WXWidget GetClientWidget() const { return m_mainWidget; };

-    
+

     /*
     virtual void OnRaise();
     virtual void OnLower();
     */
     /*
     virtual void OnRaise();
     virtual void OnLower();
     */

-    
+

     void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
     wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
     void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
     wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }

-    
+

 protected:
     wxMDIParentFrame* 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);
     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 ;
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const;
     void DoGetPosition(int *x, int *y) const ;

+    void DoSetSizeHints(int minW, int minH,
+                        int maxW, int maxH,
+                        int incW, int incH);

 };
 
 /* The client window is a child of the parent MDI frame, and itself
 };
 
 /* The client window is a child of the parent MDI frame, and itself


@@ -210,40 +205,40 @@ protected:
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 

-class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxNotebook

 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

-        
+

 public:
     wxMDIClientWindow() ;
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
     {
         CreateClient(parent, style);
     }
 public:
     wxMDIClientWindow() ;
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
     {
         CreateClient(parent, style);
     }

-    
-    ~wxMDIClientWindow();
-    
+
+    virtual ~wxMDIClientWindow();
+

     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
     // 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);
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);

-    
+

     // Implementation
     void OnPageChanged(wxNotebookEvent& event);
 
     int FindPage(const wxNotebookPage* page);
     // Implementation
     void OnPageChanged(wxNotebookEvent& event);
 
     int FindPage(const wxNotebookPage* page);

-    
+

 protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 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 ;
     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()
 };
 private:
     DECLARE_EVENT_TABLE()
 };