Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/crypto_module_password_dialog.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 104 matching lines @@
       GTK_DIALOG_NO_SEPARATOR,
       NULL);  // Populate the buttons later, for control over the OK button.
   gtk_dialog_add_button(GTK_DIALOG(dialog_),
                         GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
   GtkWidget* ok_button = gtk_util::AddButtonToDialog(
       dialog_,
       l10n_util::GetStringUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_OK_BUTTON_LABEL).c_str(),
       GTK_STOCK_OK,
       GTK_RESPONSE_ACCEPT);
-  gtk_widget_set_can_default(ok_button, TRUE);
+  GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
   gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT);
 
   // Select an appropriate text for the reason.
   std::string text;
   const string16& server16 = UTF8ToUTF16(server);
   const string16& slot16 = UTF8ToUTF16(slot_name);
   switch (reason) {
     case browser::kCryptoModulePasswordKeygen:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_KEYGEN, slot16, server16);
@@ skipping 87 matching lines @@
 }
 
 crypto::CryptoModuleBlockingPasswordDelegate*
     NewCryptoModuleBlockingDialogDelegate(
         CryptoModulePasswordReason reason,
         const std::string& server) {
   return new CryptoModuleBlockingDialogDelegate(reason, server);
 }
 
 }  // namespace browser