No real changes, just cleanup week days handling in wxGenericCalendarCtrl.

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index f0493408da9a56f0d6fb45515467dada110875de..64f808bbadd4203ac56dd766216e3f4844f84ace 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -12,11 +12,7 @@
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 

-#ifdef __GNUG__
-#pragma interface "frame.h"
-#endif
-
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase

 {
 public:
     wxFrame() { Init(); }
 {
 public:
     wxFrame() { Init(); }


@@ -29,10 +25,10 @@ public:
         const wxString& name = wxFrameNameStr)
     {
         Init();
         const wxString& name = wxFrameNameStr)
     {
         Init();

-        
+

         Create(parent, id, title, pos, size, style, name);
     }
         Create(parent, id, title, pos, size, style, name);
     }

-    
+

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


@@ -40,54 +36,40 @@ 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);

-    
+

     virtual ~wxFrame();
     virtual ~wxFrame();

-    
-    virtual bool Show(bool show = TRUE);
-    
+
+    virtual bool Show(bool show = true);
+

     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);

-    
+

     // Set title
     void SetTitle(const wxString& title);
     // Set title
     void SetTitle(const wxString& title);

-    wxString GetTitle() const { return m_title; }
-    
+

     // Set icon
     // Set icon

-    virtual void SetIcon(const wxIcon& icon);
-    
+    virtual void SetIcons(const wxIconBundle& icons);
+

 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 #endif // wxUSE_STATUSBAR

-    
+

     // Create toolbar
 #if wxUSE_TOOLBAR
     // Create toolbar
 #if wxUSE_TOOLBAR

-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = wxID_ANY,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void SetToolBar(wxToolBar *toolbar);

     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR

-    
-    // Iconize
-    virtual void Iconize(bool iconize);
-    
-    virtual bool IsIconized() const;
-    
-    // Is the frame maximized? Returns FALSE under Motif (but TRUE for
-    // wxMDIChildFrame due to the tabbed implementation).
-    virtual bool IsMaximized() const;
-    
-    virtual void Maximize(bool maximize);
-    
-    virtual void Raise();
-    virtual void Lower();
-    
-    virtual void Restore();
-    
+

     // Implementation only from now on
     // -------------------------------
     // Implementation only from now on
     // -------------------------------

-    
+

     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnActivate(wxActivateEvent& event);

-    
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetMenuBarWidget() const;
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetMenuBarWidget() const;


@@ -95,40 +77,53 @@ public:
     WXWidget GetWorkAreaWidget() const { return m_workArea; }
     WXWidget GetClientAreaWidget() const { return m_clientArea; }
     WXWidget GetTopWidget() const { return m_frameShell; }
     WXWidget GetWorkAreaWidget() const { return m_workArea; }
     WXWidget GetClientAreaWidget() const { return m_clientArea; }
     WXWidget GetTopWidget() const { return m_frameShell; }

-    
-    virtual WXWidget GetMainWidget() const { return m_frameWidget; }
-    
+
+    virtual WXWidget GetMainWidget() const { return m_mainWidget; }
+

     // The widget that can have children on it
     WXWidget GetClientWidget() const;
     bool GetVisibleStatus() const { return m_visibleStatus; }
     // The widget that can have children on it
     WXWidget GetClientWidget() const;
     bool GetVisibleStatus() const { return m_visibleStatus; }

-    
+    void SetVisibleStatus( bool status ) { m_visibleStatus = status; }
+

     bool PreResize();
     bool PreResize();

-    
-protected:
+
+    // for generic/mdig.h
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+private:

     // common part of all ctors
     void Init();
     // common part of all ctors
     void Init();

-    
+
+    // set a single icon for the frame
+    void DoSetIcon( const wxIcon& icon );
+

     //// Motif-specific
     WXWidget              m_frameShell;
     //// Motif-specific
     WXWidget              m_frameShell;

-    WXWidget              m_frameWidget;

     WXWidget              m_workArea;
     WXWidget              m_clientArea;
     WXWidget              m_workArea;
     WXWidget              m_clientArea;

-    wxString              m_title;

     bool                  m_visibleStatus;
     bool                  m_iconized;
     bool                  m_visibleStatus;
     bool                  m_iconized;

-    
-    virtual void DoGetClientSize(int *width, int *height) const;
+

     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSize(int *width, int *height) const;

-    virtual void DoGetPosition(int *x, int *y) const;

     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);

-    
+

 private:
 private:

+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name);
+
+
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-        DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 };
 

-#endif
-// _WX_MOTIF_FRAME_H_
+#endif // _WX_MOTIF_FRAME_H_
+