don't define comparison operators taking wxStrings when wxUSE_STL == 1

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index a18741217d9c19e5897f6c0c0c0e8a36fff9d6e1..e2201ae8fd7fbe302d58101ef5b8b5b8280915b1 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -174,11 +174,16 @@ public:
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);

-    
+

     // Is this the active frame (highlighted in the taskbar)?
     virtual bool IsActive()
         { return (wxGetTopLevelParent(FindFocus()) == this); }
 
     // Is this the active frame (highlighted in the taskbar)?
     virtual bool IsActive()
         { return (wxGetTopLevelParent(FindFocus()) == this); }
 

+#if defined(__SMARTPHONE__)
+    virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
+    virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
+#endif // __SMARTPHONE__
+

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


@@ -189,7 +194,7 @@ public:
 
     // event handlers
     void OnCloseWindow(wxCloseEvent& event);
 
     // event handlers
     void OnCloseWindow(wxCloseEvent& event);

-    void OnSize(wxSizeEvent& event);
+    void OnSize(wxSizeEvent& WXUNUSED(event)) { DoLayout(); }

 
     // this should go away, but for now it's called from docview.cpp,
     // so should be there for all platforms
 
     // this should go away, but for now it's called from docview.cpp,
     // so should be there for all platforms


@@ -216,6 +221,10 @@ protected:
     // send the iconize event, return true if processed
     bool SendIconizeEvent(bool iconized = true);
 
     // send the iconize event, return true if processed
     bool SendIconizeEvent(bool iconized = true);
 

+    // do TLW-specific layout: we resize our unique child to fill the entire
+    // client area
+    void DoLayout();
+

     // Get the default size for the new window if no explicit size given. If
     // there are better default sizes then these can be changed, just as long
     // as they are not too small for TLWs (and not larger than screen).
     // Get the default size for the new window if no explicit size given. If
     // there are better default sizes then these can be changed, just as long
     // as they are not too small for TLWs (and not larger than screen).


@@ -232,7 +241,10 @@ protected:
 
 
 // include the real class declaration
 
 
 // include the real class declaration

-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+    #include "wx/palmos/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowPalm
+#elif defined(__WXMSW__)

     #include "wx/msw/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMSW
 #elif defined(__WXGTK__)
     #include "wx/msw/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMSW
 #elif defined(__WXGTK__)