fixed warnings after GetFont prototype change

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 9edcf899f66953ec8170531faee4c4d381a18b2b..e446186e1f6c55bde7476dabab3edfb659f9bf2a 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -11,7 +11,7 @@
 #ifndef __WX_UNIV_TOPLEVEL_H__
 #define __WX_UNIV_TOPLEVEL_H__
 
 #ifndef __WX_UNIV_TOPLEVEL_H__
 #define __WX_UNIV_TOPLEVEL_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univtoplevel.h"
 #endif
 
     #pragma interface "univtoplevel.h"
 #endif
 


@@ -36,7 +36,7 @@ enum
     wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
     wxTOPLEVEL_BUTTON_ICONIZE =  0x04000000,
     wxTOPLEVEL_BUTTON_RESTORE  = 0x08000000,
     wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
     wxTOPLEVEL_BUTTON_ICONIZE =  0x04000000,
     wxTOPLEVEL_BUTTON_RESTORE  = 0x08000000,

-    wxTOPLEVEL_BUTTON_HELP     = 0x10000000,
+    wxTOPLEVEL_BUTTON_HELP     = 0x10000000

 };
 
 // frame hit test return values:
 };
 
 // frame hit test return values:


@@ -143,7 +143,7 @@ public:
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 

-    virtual bool ProvidesBackground() { return TRUE; }
+    virtual bool ProvidesBackground() const { return TRUE; }

     
 protected:
     // handle titlebar button click event
     
 protected:
     // handle titlebar button click event


@@ -158,7 +158,7 @@ protected:
     void Init();
 
     void RefreshTitleBar();
     void Init();
 
     void RefreshTitleBar();

-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);

     void OnSystemMenu(wxCommandEvent& event);
 
     // TRUE if wxTLW should render decorations (aka titlebar) itself
     void OnSystemMenu(wxCommandEvent& event);
 
     // TRUE if wxTLW should render decorations (aka titlebar) itself