conversions from int/long to wxString won't compile any more

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 99afca1a6558190a4c8359fa6f76c9fdb94b56b2..ef7ec0b3c6abea3072a3efecee488992b3dd1e44 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -20,28 +20,29 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 
-// Dialog boxes
-class WXDLLEXPORT wxPanel: public wxWindow
+
+class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
   wxPanel();
 
   // Old-style constructor (no default values for coordinates to avoid ambiguity
   // with the new one)
-  inline wxPanel(wxWindow *parent,
-                 int x, int y, int width, int height,
-                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                 const wxString& name = wxPanelNameStr)
+  wxPanel(wxWindow *parent,
+          int x, int y, int width, int height,
+          long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+          const wxString& name = wxPanelNameStr)
   {
       Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }
 
   // Constructor
-  inline wxPanel(wxWindow *parent, wxWindowID id = -1,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                 const wxString& name = wxPanelNameStr)
+  wxPanel(wxWindow *parent,
+          wxWindowID id = -1,
+          const wxPoint& pos = wxDefaultPosition,
+          const wxSize& size = wxDefaultSize,
+          long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+          const wxString& name = wxPanelNameStr)
   {
       Create(parent, id, pos, size, style, name);
   }
@@ -56,20 +57,19 @@ public:
   // to the dialog via validators.
   virtual void InitDialog();
 
-  // overriden base class virtuals
-  virtual void SetFocus();
-
-  // callbacks
     // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
+  
     // Process a keyboard navigation message (Tab traversal)
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
-protected:
-  bool SetFocusToNextChild(wxNode *nodeCurrent = NULL, bool bForward = TRUE);
+  // override base class virtuals
+    // we don't want focus for ourselves
+  virtual bool AcceptsFocus() const { return FALSE; }
 
-DECLARE_DYNAMIC_CLASS(wxPanel)
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif