Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

[wxWidgets.git] / include / wx / msw / toplevel.h

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 98ae4f2594cf5120e0d118ce756e413271a089d7..202983d285f312b1acd3baae0057b7f732a763aa 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -55,17 +55,28 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);

+    virtual void SetIcons(const wxIconBundle& icons );

     virtual void Restore();
 
     virtual bool Show(bool show = TRUE);
 
     virtual void Restore();
 
     virtual bool Show(bool show = TRUE);
 

-    // FIXME -- not yet moved from wxFrame to wxTLW
-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) { return FALSE; }
-    virtual bool IsFullScreen() const { return FALSE; }
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }
+
+    // wxMSW only: EnableCloseButton(FALSE) may be used to remove the "Close"
+    // button from the title bar
+    bool EnableCloseButton(bool enable = TRUE);

 
     // implementation from now on
     // --------------------------
 
 
     // implementation from now on
     // --------------------------
 

+    // event handlers
+    void OnActivate(wxActivateEvent& event);
+
+    // called by wxWindow whenever it gets focus
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+

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


@@ -77,7 +88,7 @@ protected:
 
     // create a new dialog using the given dialog template from resources,
     // return FALSE if it couldn't be created
 
     // create a new dialog using the given dialog template from resources,
     // return FALSE if it couldn't be created

-    bool CreateDialog(const wxChar *dlgTemplate,
+    bool CreateDialog(const void *dlgTemplate,

                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size);
                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size);


@@ -85,21 +96,30 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 

-    // implement the geometry-related methods for a top level window
-    virtual void DoSetClientSize(int width, int height);
+    // translate wxWindows flags to Windows ones
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;

 
 

-    // get the MSW window flags corresponding to wxWindows ones
-    //
-    // the functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
-    long MSWGetCreateWindowFlags(long *exflags) const;
+    // choose the right parent to use with CreateWindow()
+    virtual WXHWND MSWGetParent() const;

 
 

-    // is the frame currently iconized?
+    // is the window currently iconized?

     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;

+
+    // Data to save/restore when calling ShowFullScreen
+    long                  m_fsStyle; // Passed to ShowFullScreen
+    wxRect                m_fsOldSize;
+    long                  m_fsOldWindowStyle;
+    bool                  m_fsIsMaximized;
+    bool                  m_fsIsShowing;
+
+    // the last focused child: we restore focus to it on activation
+    wxWindow             *m_winLastFocused;
+
+    DECLARE_EVENT_TABLE()

 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs