added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 8fa710f1fd1defec6ec0da627be1803a756964bb..2033fb0d4e4b8b55116791d6c6195ea8992ff741 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,23 +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);
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
+    virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);

     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);

-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__

 
 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,


@@ -129,15 +130,15 @@ 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__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)

     class ButtonMenu
     {
     public:
         ButtonMenu();
         ~ButtonMenu();
 
     class ButtonMenu
     {
     public:
         ButtonMenu();
         ~ButtonMenu();
 

-        void SetButton(int id = wxID_ANY, 
-                       const wxString& label  = wxEmptyString, 
+        void SetButton(int id = wxID_ANY,
+                       const wxString& label  = wxEmptyString,

                        wxMenu *subMenu = NULL);
 
         bool IsAssigned() const {return m_assigned;}
                        wxMenu *subMenu = NULL);
 
         bool IsAssigned() const {return m_assigned;}


@@ -162,7 +163,7 @@ protected:
 
     void ReloadButton(ButtonMenu& button, UINT menuID);
     void ReloadAllButtons();
 
     void ReloadButton(ButtonMenu& button, UINT menuID);
     void ReloadAllButtons();

-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__

 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)