suppress VC7.1 64 bit correctness warnings

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 86247ab774e3ce59000778e709aaf8677d12f5dc..c4b7e47287a3f48b7c9961049e3db666095eddeb 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -50,9 +50,9 @@ public:
     virtual ~wxTopLevelWindowMSW();
 
     // implement base class pure virtuals
     virtual ~wxTopLevelWindowMSW();
 
     // implement base class pure virtuals

-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);

     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );


@@ -61,15 +61,16 @@ public:
 #ifndef __WXWINCE__
     virtual bool SetShape(const wxRegion& region);
 #endif // __WXWINCE__
 #ifndef __WXWINCE__
     virtual bool SetShape(const wxRegion& region);
 #endif // __WXWINCE__

+    virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);

 
 

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

 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
 
     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"
+    // wxMSW only: EnableCloseButton(false) may be used to remove the "Close"

     // button from the title bar
     // button from the title bar

-    bool EnableCloseButton(bool enable = TRUE);
+    bool EnableCloseButton(bool enable = true);

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


@@ -81,17 +82,23 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 

+#ifdef __SMARTPHONE__
+    void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
+    void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
+    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
+#endif // __SMARTPHONE__
+

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

-    // create a new frame, return FALSE if it couldn't be created
+    // create a new frame, return false if it couldn't be created

     bool CreateFrame(const wxString& title,
                      const wxPoint& pos,
                      const wxSize& size);
 
     // create a new dialog using the given dialog template from resources,
     bool CreateFrame(const wxString& title,
                      const wxPoint& pos,
                      const wxSize& size);
 
     // create a new dialog using the given dialog template from resources,

-    // return FALSE if it couldn't be created
+    // return false if it couldn't be created

     bool CreateDialog(const void *dlgTemplate,
                       const wxString& title,
                       const wxPoint& pos,
     bool CreateDialog(const void *dlgTemplate,
                       const wxString& title,
                       const wxPoint& pos,


@@ -123,6 +130,41 @@ protected:
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 

+#ifdef __SMARTPHONE__
+    class ButtonMenu
+    {
+    public:
+        ButtonMenu();
+        ~ButtonMenu();
+
+        void SetButton(int id = wxID_ANY,
+                       const wxString& label  = wxEmptyString,
+                       wxMenu *subMenu = NULL);
+
+        bool IsAssigned() const {return m_assigned;}
+        bool IsMenu() const {return m_menu!=NULL;}
+
+        int GetId() const {return m_id;}
+        wxMenu* GetMenu() const {return m_menu;}
+        wxString GetLabel() {return m_label;}
+
+        static wxMenu *DuplicateMenu(wxMenu *menu);
+
+    protected:
+        int      m_id;
+        wxString m_label;
+        wxMenu  *m_menu;
+        bool     m_assigned;
+    };
+
+    ButtonMenu               m_LeftButton;
+    ButtonMenu               m_RightButton;
+    HWND                     m_MenuBarHWND;
+
+    void ReloadButton(ButtonMenu& button, UINT menuID);
+    void ReloadAllButtons();
+#endif // __SMARTPHONE__
+

     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };