Fleshes out WidgetGTK and WindowGTK a bit more. This is still vary

rough, but makes things work a bit more. BUG=none TEST=none Review URL: http://codereview.chromium.org/113123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15598 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · May 7, 2009 · 0ae186f · 0ae186f
1 parent 601bffc
commit 0ae186f
Show file tree

Hide file tree

Showing 19 changed files with 615 additions and 95 deletions.
diff --git a/build/build_config.h b/build/build_config.h
@@ -19,6 +19,10 @@
 #define OS_MACOSX 1
 #elif defined(__linux__)
 #define OS_LINUX 1
+// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
+#if !defined(TOOLKIT_VIEWS)
+#define TOOLKIT_GTK
+#endif
 #elif defined(_WIN32)
 #define OS_WIN 1
 #else

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -2984,13 +2984,16 @@
             'views/window/dialog_client_view.h',
             'views/window/dialog_delegate.cc',
             'views/window/dialog_delegate.h',
+            'views/window/hit_test.h',
             'views/window/native_frame_view.cc',
             'views/window/native_frame_view.h',
             'views/window/non_client_view.cc',
             'views/window/non_client_view.h',
             'views/window/window.h',
             'views/window/window_delegate.cc',
             'views/window/window_delegate.h',
+            'views/window/window_gtk.cc',
+            'views/window/window_gtk.h',
             'views/window/window_resources.h',
             'views/window/window_win.cc',
             'views/window/window_win.h',
@@ -3035,13 +3038,10 @@
                 'views/widget/aero_tooltip_manager.cc',
                 'views/widget/root_view_drop_target.cc',
                 'views/widget/tooltip_manager.cc',
-                'views/window/client_view.cc',
-                'views/window/custom_frame_view.cc',
                 'views/window/dialog_delegate.cc',
                 'views/window/dialog_client_view.cc',
+                'views/window/hit_test.cc',
                 'views/window/native_frame_view.cc',
-                'views/window/non_client_view.cc',
-                'views/window/window_delegate.cc',
               ],
             }],
             ['OS=="win"', {
@@ -3089,13 +3089,9 @@
                 'views/widget/root_view_drop_target.cc',
                 'views/widget/tooltip_manager.cc',
                 'views/widget/widget_win.cc',
-                'views/window/client_view.cc',
-                'views/window/custom_frame_view.cc',
                 'views/window/dialog_delegate.cc',
                 'views/window/dialog_client_view.cc',
                 'views/window/native_frame_view.cc',
-                'views/window/non_client_view.cc',
-                'views/window/window_delegate.cc',
                 'views/window/window_win.cc',
               ],
             }],

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
@@ -269,12 +269,6 @@ DownloadRequestDialogDelegate* DownloadRequestDialogDelegate::Create(
   return NULL;
 }
 
-views::Window* CreateInputWindow(gfx::NativeWindow parent_hwnd,
-                                 InputWindowDelegate* delegate) {
-  NOTIMPLEMENTED();
-  return new views::Window();
-}
-
 namespace download_util {
 
 void DragDownload(const DownloadItem* download, SkBitmap* icon) {

diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
@@ -234,11 +234,13 @@ class MenuItemView {
 class MenuDelegate {
 };
 
+#if !defined(OS_LINUX)
 class Window {
  public:
   void Show() { NOTIMPLEMENTED(); }
   virtual void Close() { NOTIMPLEMENTED(); }
 };
+#endif
 
 }  // namespace views
 
@@ -277,9 +279,6 @@ class Menu {
   void AppendDelegateMenuItem(int item_id) { NOTIMPLEMENTED(); }
 };
 
-views::Window* CreateInputWindow(gfx::NativeWindow parent_hwnd,
-                                 InputWindowDelegate* delegate);
-
 class BookmarkManagerView {
  public:
    static BookmarkManagerView* current() {

diff --git a/chrome/views/controls/button/native_button.cc b/chrome/views/controls/button/native_button.cc
@@ -4,6 +4,10 @@
 
 #include "chrome/views/controls/button/native_button.h"
 
+#if defined(OS_LINUX)
+#include <gdk/gdkkeysyms.h>
+#endif
+
 #include "app/l10n_util.h"
 #include "base/logging.h"
 
@@ -69,10 +73,15 @@ void NativeButton::SetLabel(const std::wstring& label) {
 void NativeButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
+#if defined(OS_WIN)
+  int return_code = VK_RETURN;
+#else
+  int return_code = GDK_Return;
+#endif
   if (is_default)
-    AddAccelerator(Accelerator(VK_RETURN, false, false, false));
+    AddAccelerator(Accelerator(return_code, false, false, false));
   else
-    RemoveAccelerator(Accelerator(VK_RETURN, false, false, false));
+    RemoveAccelerator(Accelerator(return_code, false, false, false));
   SetAppearsAsDefault(is_default);
 }
 
@@ -106,6 +115,7 @@ gfx::Size NativeButton::GetPreferredSize() {
 
   // Clamp the size returned to at least the minimum size.
   if (!ignore_minimum_size_) {
+#if defined(OS_WIN)
     if (minimum_size_.width()) {
       int min_width = font_.horizontal_dlus_to_pixels(minimum_size_.width());
       sz.set_width(std::max(static_cast<int>(sz.width()), min_width));
@@ -114,6 +124,10 @@ gfx::Size NativeButton::GetPreferredSize() {
       int min_height = font_.vertical_dlus_to_pixels(minimum_size_.height());
       sz.set_height(std::max(static_cast<int>(sz.height()), min_height));
     }
+#else
+    if (minimum_size_.width() || minimum_size_.height())
+      NOTIMPLEMENTED();
+#endif
   }
 
   return sz;

diff --git a/chrome/views/controls/button/native_button_wrapper.h b/chrome/views/controls/button/native_button_wrapper.h
@@ -12,6 +12,7 @@ namespace views {
 class Checkbox;
 class NativeButton;
 class RadioButton;
+class View;
 
 // A specialization of NativeControlWrapper that hosts a platform-native button.
 class NativeButtonWrapper {

diff --git a/chrome/views/event.h b/chrome/views/event.h
@@ -6,13 +6,11 @@
 #define CHROME_VIEWS_EVENT_H_
 
 #include "base/basictypes.h"
+#include "base/gfx/point.h"
 
 #if defined(OS_LINUX)
-#include <gdk/gdk.h>
+typedef struct _GdkEventKey GdkEventKey;
 #endif
-
-#include "base/gfx/point.h"
-
 class OSExchangeData;
 
 namespace views {
@@ -218,7 +216,7 @@ class MouseEvent : public LocatedEvent {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(MouseEvent);
+  DISALLOW_COPY_AND_ASSIGN(MouseEvent);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -235,7 +233,7 @@ class KeyEvent : public Event {
   // Create a new key event
   KeyEvent(EventType type, int ch, int repeat_count, int message_flags);
 #elif defined(OS_LINUX)
-  KeyEvent(GdkEventKey* event);
+  explicit KeyEvent(GdkEventKey* event);
 #endif
 
   int GetCharacter() const {

diff --git a/chrome/views/event_gtk.cc b/chrome/views/event_gtk.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/views/event.h"
 
+#include <gdk/gdk.h>
+
 namespace views {
 
 KeyEvent::KeyEvent(GdkEventKey* event)

diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
@@ -5,19 +5,17 @@
 #ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
 #define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
 
-#include "build/build_config.h"
-
-#if defined(OS_LINUX)
-#include <gtk/gtk.h>
-#endif
+#include <string>
 
-#if defined(OS_WIN)
 #include "base/ref_counted.h"
-#endif
-
+#include "build/build_config.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/view.h"
 
+#if defined(OS_LINUX)
+typedef struct _GdkEventExpose GdkEventExpose;
+#endif
+
 namespace views {
 
 class PaintTask;

diff --git a/chrome/views/widget/root_view_gtk.cc b/chrome/views/widget/root_view_gtk.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/views/widget/root_view.h"
 
+#include <gtk/gtk.h>
+
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
 #include "skia/include/SkColor.h"